Update Qt 6.7.1

IB-8094 Signed-off-by: Raul Metsma <[email protected]>
web-eid · May 27, 2024 · b66dfa6 · b66dfa6
1 parent e2d4e23
commit b66dfa6
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/.github/workflows/cmake-windows.yml b/.github/workflows/cmake-windows.yml
@@ -5,11 +5,19 @@ on: [push, pull_request]
 env:
   BUILD_TYPE: RelWithDebInfo
   BUILD_NUMBER: ${{github.run_number}}
-  CMAKE_BUILD_PARALLEL_LEVEL: 3
+  CMAKE_BUILD_PARALLEL_LEVEL: 4
 
 jobs:
   build:
-    runs-on: windows-2019
+    runs-on: ${{ matrix.image }}
+    strategy:
+      matrix:
+        vcver: [142, 143]
+        include:
+        - vcver: 142
+          image: windows-2019
+        - vcver: 143
+          image: windows-2022
 
     steps:
       - name: Checkout code
@@ -27,7 +35,7 @@ jobs:
       - name: Install Qt
         uses: jurplel/install-qt-action@v3
         with:
-          version: 6.6.3
+          version: 6.7.1
           arch: win64_msvc2019_64
 
       - name: Setup MS Visual C++ dev env
@@ -45,7 +53,7 @@ jobs:
       - name: Configure
         run: |
           cmake "-GNinja" -S . -B build `
-            "-DCMAKE_TOOLCHAIN_FILE=${env:VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" `
+            "-DCMAKE_TOOLCHAIN_FILE=${env:RUNVCPKG_VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" `
             "-DCMAKE_BUILD_TYPE=${env:BUILD_TYPE}"
 
       - name: Build
@@ -60,7 +68,7 @@ jobs:
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: web-eid-app-windows-build-${{github.run_number}}
+          name: web-eid-app-windows-build-VC${{matrix.vcver}}-${{github.run_number}}
           path: |
             build/src/app/*.msi
             build/src/app/*.exe

diff --git a/install/web-eid.wxs b/install/web-eid.wxs
@@ -92,7 +92,7 @@
           <File Source="$(var.qt_path)\..\plugins\platforms\qwindows$(var.qt_suffix).dll" />
         </Directory>
         <Directory Id="styles" Name="styles">
-          <File Source="$(var.qt_path)\..\plugins\styles\qwindowsvistastyle$(var.qt_suffix).dll" />
+          <File Source="$(var.qt_path)\..\plugins\styles\qmodernwindowsstyle$(var.qt_suffix).dll" />
         </Directory>
         <Directory Id="imageformats" Name="imageformats">
           <File Source="$(var.qt_path)\..\plugins\imageformats\qsvg$(var.qt_suffix).dll" />