Merge pull request #2287 from srcejon/win_qt6

Use Qt 6 for Windows github build
Remove test code
2024-11-21 15:51:47 -05:00 · 2024-10-22 01:45:01 +02:00 · 2024-10-20 13:05:29 +01:00 · 2024-10-20 12:09:11 +01:00 · 2024-10-20 11:19:29 +01:00 · 2024-10-20 10:51:07 +01:00
1 changed files with 6 additions and 5 deletions
--- a/.github/workflows/sdrangel.yml
+++ b/.github/workflows/sdrangel.yml
@ -24,7 +24,7 @@ jobs:
            WIN_ARCH: "x64",
            os: windows-latest,
            QT_INST_DIR: "C:/",
-            QTDIR: "C:/Qt/5.15.2/msvc2019_64",
+            QTDIR: "C:/Qt/6.7.3/msvc2019_64",
            QT_ARCH: win64_msvc2019_64,
            boost_dl: "${{ github.workspace }}\\downloads\\boost",
            lib_dir: "C:\\Libraries",
@ -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.7.3'
          dir: ${{matrix.config.QT_INST_DIR}}
          arch: ${{matrix.config.QT_ARCH}}
          setup-python: false
-          modules: 'qtcharts 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: |
-          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 -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
Author	SHA1	Message	Date
Edouard Griffiths	f6f2d9bee7	Merge pull request #2287 from srcejon/win_qt6 Use Qt 6 for Windows github build	2024-10-22 01:45:01 +02:00
Jon Beniston	ac49a480f4	Remove test code	2024-10-20 13:05:29 +01:00
Jon Beniston	31cbe96b4c	Add qtshadertools	2024-10-20 12:09:11 +01:00
Jon Beniston	5b9e61d839	WebEngine install not supported for 6.8 yet.	2024-10-20 11:19:29 +01:00
Jon Beniston	e3af72febb	Add qtwebview - Is this the only way to include web engine?	2024-10-20 10:51:07 +01:00
Jon Beniston	aaf9f53571	Add qtwebsockets	2024-10-20 10:41:48 +01:00
Jon Beniston	9171ae9cd7	Add more Qt modules and set ENABLE_QT6=ON	2024-10-20 10:35:24 +01:00
Jon Beniston	0b84a572d6	Update Qt optional packages for 6.8	2024-10-20 10:23:56 +01:00
Jon Beniston	ec2f62fa5c	Allow build test. Remove later.	2024-10-20 09:58:24 +01:00
Jon Beniston	a47c0913b5	Use Qt 6.8 for Windows build	2024-10-20 09:53:25 +01:00