From 9a18f3f7ced545455a800a6f9075f8963b3c2f3d Mon Sep 17 00:00:00 2001 From: Jon Beniston Date: Thu, 17 Nov 2022 23:26:54 +0000 Subject: [PATCH] Enable compilation with Qt 6.2 --- CMakeLists.txt | 5 +++-- plugins/channelrx/CMakeLists.txt | 2 +- sdrbase/util/simpleserializer.h | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1f5e6673a..0da29ed14 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -448,10 +448,11 @@ if (BUILD_GUI) OpenGLWidgets Quick QuickWidgets - TextToSpeech + OPTIONAL_COMPONENTS WebEngineQuick WebEngineCore - WebEngineWidgets) + WebEngineWidgets + TextToSpeech) else() find_package(Qt5 REQUIRED COMPONENTS diff --git a/plugins/channelrx/CMakeLists.txt b/plugins/channelrx/CMakeLists.txt index f3ad92696..15aa47fb7 100644 --- a/plugins/channelrx/CMakeLists.txt +++ b/plugins/channelrx/CMakeLists.txt @@ -1,6 +1,6 @@ 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(demodvormc) endif() diff --git a/sdrbase/util/simpleserializer.h b/sdrbase/util/simpleserializer.h index fc63d9907..3abab71a0 100644 --- a/sdrbase/util/simpleserializer.h +++ b/sdrbase/util/simpleserializer.h @@ -4,6 +4,7 @@ #include #include #include +#include #include "dsp/dsptypes.h" #include "export.h"