From 2af37f369bab54416b398bd703e2183a34b6f0c5 Mon Sep 17 00:00:00 2001
From: Nick Korotysh <nick.korotysh@gmail.com>
Date: Wed, 9 Oct 2024 13:03:34 +0200
Subject: [PATCH] use Qt 6.8

---
 .github/workflows/ci_macos.yaml   | 4 ++--
 .github/workflows/ci_windows.yaml | 5 +++--
 dist/msi/app_files.wxs            | 3 ---
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci_macos.yaml b/.github/workflows/ci_macos.yaml
index 7ee143e..ed2e0ed 100644
--- a/.github/workflows/ci_macos.yaml
+++ b/.github/workflows/ci_macos.yaml
@@ -12,7 +12,7 @@ concurrency:
 jobs:
   ci:
     name: Build
-    runs-on: macos-13
+    runs-on: macos-14
 
     steps:
       - name: Checkout repository
@@ -30,7 +30,7 @@ jobs:
       - name: Install Qt
         uses: jurplel/install-qt-action@v4
         with:
-          version: "6.7.*"
+          version: "6.8.*"
           modules: qtimageformats qtmultimedia
 
       - name: Build application
diff --git a/.github/workflows/ci_windows.yaml b/.github/workflows/ci_windows.yaml
index af5b4ab..99dd8b4 100644
--- a/.github/workflows/ci_windows.yaml
+++ b/.github/workflows/ci_windows.yaml
@@ -12,7 +12,7 @@ concurrency:
 jobs:
   ci:
     name: Build
-    runs-on: windows-2019
+    runs-on: windows-2022
 
     steps:
       - name: Checkout repository
@@ -31,7 +31,8 @@ jobs:
       - name: Install Qt
         uses: jurplel/install-qt-action@v4
         with:
-          version: "6.7.*"
+          version: "6.8.*"
+          arch: 'win64_msvc2022_64'
           archives: qtbase qtsvg qttools qttranslations
           modules: qtimageformats qtmultimedia
 
diff --git a/dist/msi/app_files.wxs b/dist/msi/app_files.wxs
index be42385..78a6a76 100644
--- a/dist/msi/app_files.wxs
+++ b/dist/msi/app_files.wxs
@@ -134,9 +134,6 @@ initial file was generated with the next command:
       <Component Id="cmp80E75174A493DF4F7221EE7BB7D63064" Directory="dirF6F536CAC2A521B870028196D039D8E6" Guid="{746C2A9F-BD8C-442F-B211-137F02C27D45}">
         <File Id="filEFFDA27E448FAD84740AEA7FE5939725" KeyPath="yes" Source="$(var.MySource)\plugins\tls\qcertonlybackend.dll" />
       </Component>
-      <Component Id="cmpE9BF22AEB8AE6A5CFB0DB26232C2CD61" Directory="dirF6F536CAC2A521B870028196D039D8E6" Guid="{73A3CCAD-82C1-4948-BD5B-8DA3C119B5E3}">
-        <File Id="fil023BCBF0FB0B5C3FAC402BC8068500A8" KeyPath="yes" Source="$(var.MySource)\plugins\tls\qopensslbackend.dll" />
-      </Component>
       <Component Id="cmpB13A54C5786E2EC7794076753CFAF572" Directory="dirF6F536CAC2A521B870028196D039D8E6" Guid="{F35528A8-1561-418D-BB38-CA642A9DF68B}">
         <File Id="filF3708D10267E65BA5C8EBA8876CB7461" KeyPath="yes" Source="$(var.MySource)\plugins\tls\qschannelbackend.dll" />
       </Component>