From 926ed71dba564b17e546bf14cb714e0acce0381a Mon Sep 17 00:00:00 2001 From: Jon Beniston Date: Fri, 12 Dec 2025 09:58:10 +0000 Subject: [PATCH] Use Qt 6.9.3 on Windows for #2572 --- .github/workflows/sdrangel.yml | 8 ++++---- .github/workflows/windows.yml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/sdrangel.yml b/.github/workflows/sdrangel.yml index 404d747e1..79bd00b0a 100644 --- a/.github/workflows/sdrangel.yml +++ b/.github/workflows/sdrangel.yml @@ -24,8 +24,8 @@ jobs: WIN_ARCH: "x64", os: windows-latest, QT_INST_DIR: "C:/", - QTDIR: "C:/Qt/6.7.3/msvc2019_64", - QT_ARCH: win64_msvc2019_64, + QTDIR: "C:/Qt/6.9.3/msvc2022_64", + QT_ARCH: win64_msvc2022_64, boost_dl: "${{ github.workspace }}\\downloads\\boost", lib_dir: "C:\\Libraries", generators: Ninja @@ -79,7 +79,7 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v4 with: - version: '6.7.3' + version: '6.9.3' dir: ${{matrix.config.QT_INST_DIR}} arch: ${{matrix.config.QT_ARCH}} setup-python: false @@ -90,7 +90,7 @@ jobs: cmd "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" choco install patch mkdir build && cd build - cmake .. -G "${{ matrix.config.generators }}" -DCMAKE_BUILD_TYPE=Release -DENABLE_QT6=ON -DARCH_OPT=SSE4_2 -DDEBUG_OUTPUT=ON -DENABLE_MIRISDR=OFF -DBUILD_SERVER=OFF -DCMAKE_PREFIX_PATH="C:\Qt\6.7.3\msvc2019_64;C:\Libraries\boost_1_73_0" + cmake .. -G "${{ matrix.config.generators }}" -DCMAKE_BUILD_TYPE=Release -DENABLE_QT6=ON -DARCH_OPT=SSE4_2 -DDEBUG_OUTPUT=ON -DENABLE_MIRISDR=OFF -DBUILD_SERVER=OFF -DCMAKE_PREFIX_PATH="C:\Qt\6.9.3\msvc2022_64;C:\Libraries\boost_1_73_0" cmake --build . --config Release --target package - name: Check disk space run: Get-PSDrive diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 9ed125c2e..4c930b40d 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -20,8 +20,8 @@ jobs: WIN_ARCH: "x64", os: windows-latest, QT_INST_DIR: "C:/", - QTDIR: "C:/Qt/6.7.3/msvc2019_64", - QT_ARCH: win64_msvc2019_64, + QTDIR: "C:/Qt/6.9.3/msvc2022_64", + QT_ARCH: win64_msvc2022_64, boost_dl: "${{ github.workspace }}\\downloads\\boost", lib_dir: "C:\\Libraries", generators: Ninja @@ -75,7 +75,7 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v4 with: - version: '6.7.3' + version: '6.9.3' dir: ${{matrix.config.QT_INST_DIR}} arch: ${{matrix.config.QT_ARCH}} setup-python: 'false' @@ -86,7 +86,7 @@ jobs: cmd "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" choco install patch mkdir build && cd build - cmake .. -G "${{ matrix.config.generators }}" -DCMAKE_BUILD_TYPE=Release -DENABLE_QT6=ON -DARCH_OPT=SSE4_2 -DDEBUG_OUTPUT=ON -DENABLE_MIRISDR=OFF -DBUILD_SERVER=OFF -DCMAKE_PREFIX_PATH="C:\Qt\6.7.3\msvc2019_64;C:\Libraries\boost_1_73_0" + cmake .. -G "${{ matrix.config.generators }}" -DCMAKE_BUILD_TYPE=Release -DENABLE_QT6=ON -DARCH_OPT=SSE4_2 -DDEBUG_OUTPUT=ON -DENABLE_MIRISDR=OFF -DBUILD_SERVER=OFF -DCMAKE_PREFIX_PATH="C:\Qt\6.9.3\msvc2019_64;C:\Libraries\boost_1_73_0" cmake --build . --config Release --target package - name: Check disk space run: Get-PSDrive