From be7b517499e973396d02f10d84bf4272eaeb452d Mon Sep 17 00:00:00 2001
From: pajlada <rasmus.karlsson@pajlada.com>
Date: Sat, 25 May 2024 18:26:38 +0200
Subject: [PATCH] Update Windows Qt6 version from 6.5.0 to 6.7.1 (#5420)

---
 .github/workflows/build.yml            | 36 ++++----------------------
 .github/workflows/create-installer.yml |  2 +-
 .github/workflows/test-windows.yml     |  2 +-
 CHANGELOG.md                           |  1 +
 4 files changed, 8 insertions(+), 33 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 48433029c..c45b0165b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -120,7 +120,7 @@ jobs:
             skip-crashpad: false
           # Windows
           - os: windows-latest
-            qt-version: 6.5.0
+            qt-version: 6.7.1
             force-lto: false
             plugins: true
             skip-artifact: false
@@ -165,26 +165,6 @@ jobs:
           modules: qt5compat qtimageformats
           version: ${{ matrix.qt-version }}
 
-      - name: Install Qt 6.5.3 imageformats
-        if: startsWith(matrix.qt-version, '6.')
-        uses: jurplel/install-qt-action@v4.0.0
-        with:
-          cache: false
-          modules: qtimageformats
-          set-env: false
-          version: 6.5.3
-          extra: --noarchives
-
-      - name: Find Qt 6.5.3 Path
-        if: startsWith(matrix.qt-version, '6.') && startsWith(matrix.os, 'windows')
-        shell: pwsh
-        id: find-good-imageformats
-        run: |
-          cd "$Env:RUNNER_WORKSPACE/Qt/6.5.3"
-          cd (Get-ChildItem)[0].Name
-          cd plugins/imageformats
-          echo "PLUGIN_PATH=$(pwd)" | Out-File -Path "$Env:GITHUB_OUTPUT" -Encoding ASCII
-
       # WINDOWS
       - name: Enable Developer Command Prompt (Windows)
         if: startsWith(matrix.os, 'windows')
@@ -273,12 +253,6 @@ jobs:
           cp bin/chatterino.exe Chatterino2/
           echo nightly > Chatterino2/modes
 
-      - name: Fix Qt6 (windows)
-        if: startsWith(matrix.qt-version, '6.') && startsWith(matrix.os, 'windows')
-        working-directory: build
-        run: |
-          cp ${{ steps.find-good-imageformats.outputs.PLUGIN_PATH }}/qwebp.dll Chatterino2/imageformats/qwebp.dll
-
       - name: Package (windows)
         if: startsWith(matrix.os, 'windows')
         working-directory: build
@@ -360,15 +334,15 @@ jobs:
 
       # Windows
       - uses: actions/download-artifact@v4
-        name: Windows Qt6.5.0
+        name: Windows Qt6.7.1
         with:
-          name: chatterino-windows-x86-64-Qt-6.5.0.zip
+          name: chatterino-windows-x86-64-Qt-6.7.1.zip
           path: release-artifacts/
 
       - uses: actions/download-artifact@v4
-        name: Windows Qt6.5.0 symbols
+        name: Windows Qt6.7.1 symbols
         with:
-          name: chatterino-windows-x86-64-Qt-6.5.0-symbols.pdb.7z
+          name: chatterino-windows-x86-64-Qt-6.7.1-symbols.pdb.7z
           path: release-artifacts/
 
       - uses: actions/download-artifact@v4
diff --git a/.github/workflows/create-installer.yml b/.github/workflows/create-installer.yml
index 626d3e503..ac060c96d 100644
--- a/.github/workflows/create-installer.yml
+++ b/.github/workflows/create-installer.yml
@@ -18,7 +18,7 @@ jobs:
     if: ${{ github.event_name == 'workflow_dispatch' || github.event.workflow_run.conclusion == 'success' }}
     strategy:
       matrix:
-        qt-version: ["6.5.0"]
+        qt-version: ["6.7.1"]
     steps:
       - uses: actions/checkout@v4
         with:
diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml
index 8038d1aca..ac1f1c9a0 100644
--- a/.github/workflows/test-windows.yml
+++ b/.github/workflows/test-windows.yml
@@ -24,7 +24,7 @@ jobs:
     strategy:
       matrix:
         os: [windows-latest]
-        qt-version: [5.15.2, 6.5.0]
+        qt-version: [5.15.2, 6.7.1]
         plugins: [false]
         skip-artifact: [false]
         skip-crashpad: [false]
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f546e8a2e..206abd69e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
 - Minor: Added the ability to duplicate tabs. (#5277)
 - Bugfix: If a network request errors with 200 OK, Qt's error code is now reported instead of the HTTP status. (#5378)
 - Bugfix: Fixed a crash that could occur when logging was enabled in IRC servers that were removed. (#5419)
+- Dev: Update Windows build from Qt 6.5.0 to Qt 6.7.1. (#5420)
 - Dev: Use Qt's high DPI scaling. (#4868, #5400)
 - Dev: Add doxygen build target. (#5377)
 - Dev: Make printing of strings in tests easier. (#5379)