Merge branch 'develop'

winseros · Sep 14, 2023 · 2ae6889 · 2ae6889
2 parents 7da328a + a1ec4c7
commit 2ae6889
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/installer/PBOManager.wxs b/installer/PBOManager.wxs
@@ -77,7 +77,9 @@
             <ComponentRef Id="C_MainFiles__ImageFormats__qico.dll" />
             <ComponentRef Id="C_MainFiles__Platforms__qwindows.dll" />
             <ComponentRef Id="C_MainFiles__Styles__qwindowsvistastyle.dll" />
+            <ComponentRef Id="C_MainFiles__Tls__qcertonlybackend.dll" />
             <ComponentRef Id="C_MainFiles__Tls__qopensslbackend.dll" />
+            <ComponentRef Id="C_MainFiles__Tls__qschannelbackend.dll" />
         </ComponentGroup>
 
         <Feature Id="F_MainFiles" Title="Application" Level="1" InstallDefault="local" Absent="disallow"
@@ -218,13 +220,23 @@
                       Source="$(var.ArtifactsFolder)Styles\qwindowsvistastyle.dll" />
             </Component>
         </DirectoryRef>
-
+        
         <DirectoryRef Id="D_Tls">
+            <Component Id="C_MainFiles__Tls__qcertonlybackend.dll" Guid="0A8B6A2B-8704-454F-81F7-19812CC980DB"
+                       Win64="yes">
+                <File Id="F_MainFiles__Tls__qcertonlybackend.dll" KeyPath="yes" Vital="yes"
+                      Source="$(var.ArtifactsFolder)Tls\qcertonlybackend.dll" />
+            </Component>
             <Component Id="C_MainFiles__Tls__qopensslbackend.dll" Guid="864E2C73-369B-42AF-88E4-989C858C04E2"
                        Win64="yes">
                 <File Id="F_MainFiles__Tls__qopensslbackend.dll" KeyPath="yes" Vital="yes"
                       Source="$(var.ArtifactsFolder)Tls\qopensslbackend.dll" />
             </Component>
+            <Component Id="C_MainFiles__Tls__qschannelbackend.dll" Guid="9DC559C3-3109-4EFE-8C42-87F0B9678E9C"
+                       Win64="yes">
+                <File Id="F_MainFiles__Tls__qschannelbackend.dll" KeyPath="yes" Vital="yes"
+                      Source="$(var.ArtifactsFolder)Tls\qschannelbackend.dll" />
+            </Component>
         </DirectoryRef>
     </Fragment>
 

diff --git a/pbom/CMakeLists.txt b/pbom/CMakeLists.txt
@@ -62,7 +62,9 @@ install(FILES
     ${QT_BINARIES_DIR}/plugins/styles/qwindowsvistastyle${QT_BINARIES_SUFFIX}.dll
     DESTINATION ${CMAKE_INSTALL_BINDIR}/styles)
 install(FILES 
+    ${QT_BINARIES_DIR}/plugins/tls/qcertonlybackend${QT_BINARIES_SUFFIX}.dll
     ${QT_BINARIES_DIR}/plugins/tls/qopensslbackend${QT_BINARIES_SUFFIX}.dll
+    ${QT_BINARIES_DIR}/plugins/tls/qschannelbackend${QT_BINARIES_SUFFIX}.dll
     DESTINATION ${CMAKE_INSTALL_BINDIR}/tls)
 install(FILES 
     ${QT_BINARIES_DIR}/../../Tools/OpenSSL/Win_x64/bin/libssl-1_1-x64.dll