From a47c0913b5d631e9c1161edfcd12b5a058b57810 Mon Sep 17 00:00:00 2001 From: Jon Beniston Date: Sun, 20 Oct 2024 09:53:25 +0100 Subject: [PATCH 1/9] Use Qt 6.8 for Windows build --- .github/workflows/sdrangel.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/sdrangel.yml b/.github/workflows/sdrangel.yml index c468e7399..2edd27195 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/5.15.2/msvc2019_64", - QT_ARCH: win64_msvc2019_64, + QTDIR: "C:/Qt/6.8.0/msvc2022_64", + QT_ARCH: win64_msvc2022_64, boost_dl: "${{ github.workspace }}\\downloads\\boost", lib_dir: "C:\\Libraries", generators: Ninja @@ -69,19 +69,20 @@ jobs: rm -rf boost_*/* download.tar.bz2 download.tar shell: bash - name: Install Qt - uses: jurplel/install-qt-action@v3 + uses: jurplel/install-qt-action@v4 with: + version: '6.8.0' dir: ${{matrix.config.QT_INST_DIR}} arch: ${{matrix.config.QT_ARCH}} setup-python: false - modules: 'qtcharts qtwebengine' + modules: 'qtcharts qtwebengine qtstatemachine' - name: build sdrangel on Windows if: startsWith(matrix.config.os, 'windows') run: | - cmd "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat" + 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 -DARCH_OPT=SSE4_2 -DDEBUG_OUTPUT=ON -DENABLE_MIRISDR=OFF -DBUILD_SERVER=OFF -DCMAKE_PREFIX_PATH="C:\Qt\5.15.2\msvc2019_64;C:\Libraries\boost_1_73_0" + cmake .. -G "${{ matrix.config.generators }}" -DCMAKE_BUILD_TYPE=Release -DARCH_OPT=SSE4_2 -DDEBUG_OUTPUT=ON -DENABLE_MIRISDR=OFF -DBUILD_SERVER=OFF -DCMAKE_PREFIX_PATH="C:\Qt\6.8.0\msvc2022_64;C:\Libraries\boost_1_73_0" cmake --build . --config Release --target package - name: Check disk space run: Get-PSDrive From ec2f62fa5cce32ce3771409b922895845ef07d75 Mon Sep 17 00:00:00 2001 From: Jon Beniston Date: Sun, 20 Oct 2024 09:58:24 +0100 Subject: [PATCH 2/9] Allow build test. Remove later. --- .github/workflows/sdrangel.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/sdrangel.yml b/.github/workflows/sdrangel.yml index 2edd27195..efc68ab79 100644 --- a/.github/workflows/sdrangel.yml +++ b/.github/workflows/sdrangel.yml @@ -7,6 +7,7 @@ on: branches: - master - mac_ci + - win_qt6 tags: - 'v*' pull_request: From 0b84a572d67c16f9005e04a3f2e7da0c33228456 Mon Sep 17 00:00:00 2001 From: Jon Beniston Date: Sun, 20 Oct 2024 10:23:56 +0100 Subject: [PATCH 3/9] Update Qt optional packages for 6.8 --- .github/workflows/sdrangel.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sdrangel.yml b/.github/workflows/sdrangel.yml index efc68ab79..b0576bf9c 100644 --- a/.github/workflows/sdrangel.yml +++ b/.github/workflows/sdrangel.yml @@ -76,7 +76,7 @@ jobs: dir: ${{matrix.config.QT_INST_DIR}} arch: ${{matrix.config.QT_ARCH}} setup-python: false - modules: 'qtcharts qtwebengine qtstatemachine' + modules: 'qtcharts qtscxml' - name: build sdrangel on Windows if: startsWith(matrix.config.os, 'windows') run: | From 9171ae9cd75df9e25190fd285200cfaf3ff4c25c Mon Sep 17 00:00:00 2001 From: Jon Beniston Date: Sun, 20 Oct 2024 10:35:24 +0100 Subject: [PATCH 4/9] Add more Qt modules and set ENABLE_QT6=ON --- .github/workflows/sdrangel.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/sdrangel.yml b/.github/workflows/sdrangel.yml index b0576bf9c..6f86325b9 100644 --- a/.github/workflows/sdrangel.yml +++ b/.github/workflows/sdrangel.yml @@ -76,14 +76,14 @@ jobs: dir: ${{matrix.config.QT_INST_DIR}} arch: ${{matrix.config.QT_ARCH}} setup-python: false - modules: 'qtcharts qtscxml' + modules: 'qtcharts qtscxml qt5compat qtlocation qtmultimedia qtpositioning qtserialport qtspeech' - name: build sdrangel on Windows if: startsWith(matrix.config.os, 'windows') run: | 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 -DARCH_OPT=SSE4_2 -DDEBUG_OUTPUT=ON -DENABLE_MIRISDR=OFF -DBUILD_SERVER=OFF -DCMAKE_PREFIX_PATH="C:\Qt\6.8.0\msvc2022_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.8.0\msvc2022_64;C:\Libraries\boost_1_73_0" cmake --build . --config Release --target package - name: Check disk space run: Get-PSDrive From aaf9f53571a58e4fad5ba25b5150f94b1c9653f5 Mon Sep 17 00:00:00 2001 From: Jon Beniston Date: Sun, 20 Oct 2024 10:41:48 +0100 Subject: [PATCH 5/9] Add qtwebsockets --- .github/workflows/sdrangel.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sdrangel.yml b/.github/workflows/sdrangel.yml index 6f86325b9..21de04966 100644 --- a/.github/workflows/sdrangel.yml +++ b/.github/workflows/sdrangel.yml @@ -76,7 +76,7 @@ jobs: dir: ${{matrix.config.QT_INST_DIR}} arch: ${{matrix.config.QT_ARCH}} setup-python: false - modules: 'qtcharts qtscxml qt5compat qtlocation qtmultimedia qtpositioning qtserialport qtspeech' + modules: 'qtcharts qtscxml qt5compat qtlocation qtmultimedia qtpositioning qtserialport qtspeech qtwebsockets' - name: build sdrangel on Windows if: startsWith(matrix.config.os, 'windows') run: | From e3af72febb61a3eb2bb1236a4298f67693fc66d7 Mon Sep 17 00:00:00 2001 From: Jon Beniston Date: Sun, 20 Oct 2024 10:51:07 +0100 Subject: [PATCH 6/9] Add qtwebview - Is this the only way to include web engine? --- .github/workflows/sdrangel.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sdrangel.yml b/.github/workflows/sdrangel.yml index 21de04966..53456a73a 100644 --- a/.github/workflows/sdrangel.yml +++ b/.github/workflows/sdrangel.yml @@ -76,7 +76,7 @@ jobs: dir: ${{matrix.config.QT_INST_DIR}} arch: ${{matrix.config.QT_ARCH}} setup-python: false - modules: 'qtcharts qtscxml qt5compat qtlocation qtmultimedia qtpositioning qtserialport qtspeech qtwebsockets' + modules: 'qtcharts qtscxml qt5compat qtlocation qtmultimedia qtpositioning qtserialport qtspeech qtwebsockets qtwebview' - name: build sdrangel on Windows if: startsWith(matrix.config.os, 'windows') run: | From 5b9e61d839840e3afb7e74c94429fbfaf664a1ec Mon Sep 17 00:00:00 2001 From: Jon Beniston Date: Sun, 20 Oct 2024 11:19:29 +0100 Subject: [PATCH 7/9] WebEngine install not supported for 6.8 yet. --- .github/workflows/sdrangel.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/sdrangel.yml b/.github/workflows/sdrangel.yml index 53456a73a..ac910d83d 100644 --- a/.github/workflows/sdrangel.yml +++ b/.github/workflows/sdrangel.yml @@ -25,8 +25,8 @@ jobs: WIN_ARCH: "x64", os: windows-latest, QT_INST_DIR: "C:/", - QTDIR: "C:/Qt/6.8.0/msvc2022_64", - QT_ARCH: win64_msvc2022_64, + QTDIR: "C:/Qt/6.7.3/msvc2019_64", + QT_ARCH: win64_msvc2019_64, boost_dl: "${{ github.workspace }}\\downloads\\boost", lib_dir: "C:\\Libraries", generators: Ninja @@ -72,18 +72,18 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v4 with: - version: '6.8.0' + version: '6.7.3' dir: ${{matrix.config.QT_INST_DIR}} arch: ${{matrix.config.QT_ARCH}} setup-python: false - modules: 'qtcharts qtscxml qt5compat qtlocation qtmultimedia qtpositioning qtserialport qtspeech qtwebsockets qtwebview' + modules: 'qtcharts qtscxml qt5compat qtlocation qtmultimedia qtpositioning qtserialport qtspeech qtwebsockets qtwebengine' - name: build sdrangel on Windows if: startsWith(matrix.config.os, 'windows') run: | 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.8.0\msvc2022_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.7.3\msvc2019_64;C:\Libraries\boost_1_73_0" cmake --build . --config Release --target package - name: Check disk space run: Get-PSDrive From 31cbe96b4cc68249ec696c47a6ffb2ff66f6b983 Mon Sep 17 00:00:00 2001 From: Jon Beniston Date: Sun, 20 Oct 2024 12:09:11 +0100 Subject: [PATCH 8/9] Add qtshadertools --- .github/workflows/sdrangel.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sdrangel.yml b/.github/workflows/sdrangel.yml index ac910d83d..8bbbf7722 100644 --- a/.github/workflows/sdrangel.yml +++ b/.github/workflows/sdrangel.yml @@ -76,7 +76,7 @@ jobs: dir: ${{matrix.config.QT_INST_DIR}} arch: ${{matrix.config.QT_ARCH}} setup-python: false - modules: 'qtcharts qtscxml qt5compat qtlocation qtmultimedia qtpositioning qtserialport qtspeech qtwebsockets qtwebengine' + modules: 'qtcharts qtscxml qt5compat qtlocation qtmultimedia qtpositioning qtserialport qtspeech qtwebsockets qtwebengine qtshadertools' - name: build sdrangel on Windows if: startsWith(matrix.config.os, 'windows') run: | From ac49a480f4f96b2a526f8b1803c604e6d97a93d3 Mon Sep 17 00:00:00 2001 From: Jon Beniston Date: Sun, 20 Oct 2024 13:05:29 +0100 Subject: [PATCH 9/9] Remove test code --- .github/workflows/sdrangel.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/sdrangel.yml b/.github/workflows/sdrangel.yml index 8bbbf7722..ac770c5d5 100644 --- a/.github/workflows/sdrangel.yml +++ b/.github/workflows/sdrangel.yml @@ -7,7 +7,6 @@ on: branches: - master - mac_ci - - win_qt6 tags: - 'v*' pull_request: