From d96ed5f4a42b64c807453ef84e422480f8f94b0a Mon Sep 17 00:00:00 2001
From: xavier2k6 <42386382+xavier2k6@users.noreply.github.com>
Date: Mon, 3 Oct 2022 04:56:08 +0100
Subject: [PATCH] GHA CI: Bump Windows/macOS `Qt6` version to `6.4.0`

Suppressed gnu-zero-variadic-macro-arguments warning on macOS (Qt6 only).
PR #17801.
---
 .github/workflows/ci_macos.yaml   | 6 +++---
 .github/workflows/ci_windows.yaml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci_macos.yaml b/.github/workflows/ci_macos.yaml
index 6d86278c2..416ff5024 100644
--- a/.github/workflows/ci_macos.yaml
+++ b/.github/workflows/ci_macos.yaml
@@ -16,10 +16,10 @@ jobs:
       matrix:
         libt_version: ["2.0.7", "1.2.17"]
         qbt_gui: ["GUI=ON", "GUI=OFF"]
-        qt_version: ["5.15.2", "6.2.0"]
+        qt_version: ["5.15.2", "6.4.0"]
         exclude:
           - libt_version: "1.2.17"
-            qt_version: "6.2.0"
+            qt_version: "6.4.0"
 
     env:
       boost_path: "${{ github.workspace }}/../boost"
@@ -100,7 +100,7 @@ jobs:
             -B build \
             -G "Ninja" \
             -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-            -DCMAKE_CXX_FLAGS="-Werror -Wno-error=deprecated-declarations" \
+            -DCMAKE_CXX_FLAGS="-Wno-gnu-zero-variadic-macro-arguments -Werror -Wno-error=deprecated-declarations" \
             -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
             -DBOOST_ROOT="${{ env.boost_path }}" \
             -DOPENSSL_ROOT_DIR="${{ env.openssl_root }}" \
diff --git a/.github/workflows/ci_windows.yaml b/.github/workflows/ci_windows.yaml
index e31255a0e..3facbc4a1 100644
--- a/.github/workflows/ci_windows.yaml
+++ b/.github/workflows/ci_windows.yaml
@@ -76,7 +76,7 @@ jobs:
       - name: Install Qt
         uses: jurplel/install-qt-action@v3
         with:
-          version: "6.3.0"
+          version: "6.4.0"
 
       - name: Install libtorrent
         run: |