VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-06-19 06:42:31 -04:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1519 from srcejon/qt6

Browse Source 
Enable compilation with Qt 6.2
This commit is contained in:
Edouard Griffiths 2022-11-18 12:07:49 +01:00 committed by GitHub
commit 0c96865113
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -448,10 +448,11 @@ if (BUILD_GUI)
OpenGLWidgets OpenGLWidgets
Quick Quick
QuickWidgets QuickWidgets
TextToSpeech OPTIONAL_COMPONENTS
WebEngineQuick WebEngineQuick
WebEngineCore WebEngineCore
WebEngineWidgets) WebEngineWidgets
TextToSpeech)
else() else()
find_package(Qt5 find_package(Qt5
REQUIRED COMPONENTS REQUIRED COMPONENTS

2
plugins/channelrx/CMakeLists.txt
View File

@ -1,6 +1,6 @@
project(demod) project(demod)
if (ENABLE_CHANNELRX_DEMODADSB AND Qt${QT_DEFAULT_MAJOR_VERSION}Quick_FOUND AND Qt${QT_DEFAULT_MAJOR_VERSION}QuickWidgets_FOUND AND Qt${QT_DEFAULT_MAJOR_VERSION}Positioning_FOUND) if (ENABLE_CHANNELRX_DEMODADSB AND Qt${QT_DEFAULT_MAJOR_VERSION}Quick_FOUND AND Qt${QT_DEFAULT_MAJOR_VERSION}QuickWidgets_FOUND AND Qt${QT_DEFAULT_MAJOR_VERSION}Positioning_FOUND AND Qt${QT_DEFAULT_MAJOR_VERSION}TextToSpeech_FOUND)
add_subdirectory(demodadsb) add_subdirectory(demodadsb)
# add_subdirectory(demodvormc) # add_subdirectory(demodvormc)
endif() endif()

1
sdrbase/util/simpleserializer.h
View File

@ -4,6 +4,7 @@
#include <QString> #include <QString>
#include <QMap> #include <QMap>
#include <QDataStream> #include <QDataStream>
#include <QIODevice>
#include "dsp/dsptypes.h" #include "dsp/dsptypes.h"
#include "export.h" #include "export.h"