Restore the QT5 support in the wxs file

karl80038 · Sep 4, 2023 · cfdb677 · cfdb677
1 parent efee99e
commit cfdb677
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 7 deletions.
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
@@ -258,7 +258,7 @@ elseif(WIN32)
 	list(APPEND CANDLE_CMD "$ENV{WIX}bin\\candle.exe" -nologo -arch ${PLATFORM} -dMSI_VERSION=${VERSION} -dPlatform=${PLATFORM}
 		-dlibs_path=${LIBS_PATH} -dclient_path=$<TARGET_FILE:${PROJECT_NAME}> -dico_path=${CMAKE_CURRENT_SOURCE_DIR}/images/digidoc.ico
 		-dqtconf=${CMAKE_SOURCE_DIR}/qt.conf -dschemasLocation=${LIBS_PATH}/schema SchemasFragment.wxs
-		-dqt_suffix=$<$<CONFIG:Debug>:d> ${CMAKE_SOURCE_DIR}/${PROJECT_NAME}.wxs
+		-dqt_ver_major=${QT_VERSION_MAJOR} -dqt_suffix=$<$<CONFIG:Debug>:d> ${CMAKE_SOURCE_DIR}/${PROJECT_NAME}.wxs
 		${CMAKE_SOURCE_DIR}/cmake/modules/WelcomeDlg2.wxs ${CMAKE_SOURCE_DIR}/cmake/modules/WixUI_Minimal2.wxs)
 	list(APPEND LIGHT_CMD "$ENV{WIX}bin\\light.exe" -nologo -ext WixUIExtension
 		${PROJECT_NAME}.wixobj SchemasFragment.wixobj WelcomeDlg2.wixobj WixUI_Minimal2.wixobj

diff --git a/qdigidoc4.wxs b/qdigidoc4.wxs
@@ -149,16 +149,23 @@ msiexec /a libdigidocpp-3.13.8.1378.msi /qn TARGETDIR=C:\target
 <?endif ?>
             <File Source="$(var.libs_path)\libcrypto-3$(var.OpenSSLSuffix).dll"/>
             <File Source="$(var.libs_path)\libssl-3$(var.OpenSSLSuffix).dll"/>
-            <File Source="$(var.qt_path)\Qt6Core$(var.qt_suffix).dll"/>
-            <File Source="$(var.qt_path)\Qt6Gui$(var.qt_suffix).dll"/>
-            <File Source="$(var.qt_path)\Qt6Network$(var.qt_suffix).dll"/>
-            <File Source="$(var.qt_path)\Qt6PrintSupport$(var.qt_suffix).dll"/>
-            <File Source="$(var.qt_path)\Qt6Svg$(var.qt_suffix).dll"/>
-            <File Source="$(var.qt_path)\Qt6Widgets$(var.qt_suffix).dll"/>
+            <File Source="$(var.qt_path)\Qt$(var.qt_ver_major)Core$(var.qt_suffix).dll"/>
+            <File Source="$(var.qt_path)\Qt$(var.qt_ver_major)Gui$(var.qt_suffix).dll"/>
+            <File Source="$(var.qt_path)\Qt$(var.qt_ver_major)Network$(var.qt_suffix).dll"/>
+            <File Source="$(var.qt_path)\Qt$(var.qt_ver_major)PrintSupport$(var.qt_suffix).dll"/>
+            <File Source="$(var.qt_path)\Qt$(var.qt_ver_major)Svg$(var.qt_suffix).dll"/>
+            <File Source="$(var.qt_path)\Qt$(var.qt_ver_major)Widgets$(var.qt_suffix).dll"/>
             <File Source="$(var.qt_path)\D3DCompiler_47.dll"/>
             <File Source="$(var.qt_path)\opengl32sw.dll"/>
+            <?if $(var.qt_ver_major) = "5" ?>
+            <File Source="$(var.qt_path)\Qt5WinExtras$(var.qt_suffix).dll"/>
+            <File Source="$(var.qt_path)\libEGL$(var.qt_suffix).dll"/>
+            <File Source="$(var.qt_path)\libGLESv2$(var.qt_suffix).dll"/>
+            <File Source="$(var.qtconf)" />
+<?else ?>
             <File Source="$(var.qt_path)\Qt6Core5Compat$(var.qt_suffix).dll"/>
             <File Source="$(var.qt_path)\Qt6SvgWidgets$(var.qt_suffix).dll"/>
+<?endif?>
 <?endif?>
           </Component>
           <Component Id="ldapsOnW7" Guid="14397c62-610a-41ee-8168-a70757e71cdc">
@@ -173,11 +180,19 @@ msiexec /a libdigidocpp-3.13.8.1378.msi /qn TARGETDIR=C:\target
               <File Name="qwindows$(var.qt_suffix).dll"/>
             </Component>
           </Directory>
+          <?if $(var.qt_ver_major) = "5" ?>
+          <Directory Id="printsupport" Name="printsupport" FileSource="$(var.qt_path)\..\plugins\printsupport">
+            <Component Id="windowsprintersupport.dll">
+              <File Name="windowsprintersupport$(var.qt_suffix).dll"/>
+            </Component>
+          </Directory>
+<?else ?>
           <Directory Id="tls" Name="tls" FileSource="$(var.qt_path)\..\plugins\tls">
             <Component Id="qopensslbackend.dll">
               <File Name="qopensslbackend$(var.qt_suffix).dll"/>
             </Component>
           </Directory>
+<?endif?>
           <Directory Id="styles" Name="styles" FileSource="$(var.qt_path)\..\plugins\styles">
             <Component Id="qwindowsvistastyle.dll">
               <File Name="qwindowsvistastyle$(var.qt_suffix).dll"/>
@@ -204,7 +219,11 @@ msiexec /a libdigidocpp-3.13.8.1378.msi /qn TARGETDIR=C:\target
 <?ifdef var.qt_path ?>
       <ComponentRef Id="qwindows.dll" />
       <ComponentRef Id="qwindowsvistastyle.dll" />
+<?if $(var.qt_ver_major) = "5" ?>
+      <ComponentRef Id="windowsprintersupport.dll" />
+<?else ?>
       <ComponentRef Id="qopensslbackend.dll" />
+<?endif?>
       <ComponentRef Id="imageformats.dll" />
 <?endif?>
     </Feature>