From 88e52f362a51d8111b8f85b09dfe97c1b298cb46 Mon Sep 17 00:00:00 2001 From: Jon Beniston Date: Mon, 7 Jul 2025 12:54:19 +0100 Subject: [PATCH 1/2] Fix type forward declaration. --- plugins/channelrx/demoddatv/datvdemodgui.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/channelrx/demoddatv/datvdemodgui.h b/plugins/channelrx/demoddatv/datvdemodgui.h index 150f367f6..0c0453b7f 100644 --- a/plugins/channelrx/demoddatv/datvdemodgui.h +++ b/plugins/channelrx/demoddatv/datvdemodgui.h @@ -32,7 +32,7 @@ #include -class DataTSMetaData2; +struct DataTSMetaData2; class PluginAPI; class DeviceUISet; class BasebandSampleSink; From f76bfcb8f444ccb0df0fc2ed1c814e941e6ea8b2 Mon Sep 17 00:00:00 2001 From: Jon Beniston Date: Tue, 8 Jul 2025 08:25:49 +0100 Subject: [PATCH 2/2] Revert Qt to 6.7.3 on Windows. --- .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 d35486d28..8a2c0e321 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.9.1/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 @@ -74,7 +74,7 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v4 with: - version: '6.9.1' + version: '6.7.3' dir: ${{matrix.config.QT_INST_DIR}} arch: ${{matrix.config.QT_ARCH}} setup-python: false @@ -85,7 +85,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.9.1\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 diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 3258100c9..37517a457 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.9.1/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 @@ -70,7 +70,7 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v4 with: - version: '6.9.1' + version: '6.7.3' dir: ${{matrix.config.QT_INST_DIR}} arch: ${{matrix.config.QT_ARCH}} setup-python: 'false' @@ -81,7 +81,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.9.1\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