Merge pull request #1518 from srcejon/qt6

Qt6 support

CMakeLists.txt

@@ -29,6 +29,7 @@ option(HIDE_CONSOLE "Hide console when running GUI on Windows" ON)
 option(BUNDLE "Enable distribution bundle" OFF)
 set(ARCH_OPT "native" CACHE STRING "Specify instruction set to use. Will be passed directly as `-march` or `/arch:` argument on supported compilers. \
                                    'native' option will figure out host machine compatibilities and set flags accordingly (even with MSVC).")
+option(ENABLE_QT6 "Build with Qt6 rather than Qt5" OFF)
 
 # Sampling devices enablers
 option(ENABLE_AIRSPY "Enable AirSpy support" ON)
@@ -410,7 +411,22 @@ set(CMAKE_AUTORCC TRUE)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 # Qt requirements
-find_package(Qt5
+# See: https://doc-snapshots.qt.io/qt6-dev/cmake-qt5-and-qt6-compatibility.html
+if(ENABLE_QT6)
+    # Qt6 doesn't currently support Location
+    find_package(Qt6
+                   COMPONENTS
+                     Core
+                     Widgets
+                     WebSockets
+                     Multimedia
+                     MultimediaWidgets
+                     Positioning
+                     Charts
+                     SerialPort
+                     Core5Compat)
+else()
+    find_package(Qt5 5.15
                    REQUIRED COMPONENTS
                      Core
                      Widgets
@@ -420,10 +436,23 @@ find_package(Qt5
                      Positioning
                      Charts
                      SerialPort)
+endif()
 
 # for the server we don't need OpenGL/Qt Quick components
 if (BUILD_GUI)
     find_package(OpenGL REQUIRED)
+    if (ENABLE_QT6)
+        find_package(Qt6
+                       REQUIRED COMPONENTS
+                        OpenGL
+                        OpenGLWidgets
+                        Quick
+                        QuickWidgets
+                        TextToSpeech
+                        WebEngineQuick
+                        WebEngineCore
+                        WebEngineWidgets)
+    else()
         find_package(Qt5
                        REQUIRED COMPONENTS
                         OpenGL
@@ -435,6 +464,7 @@ if (BUILD_GUI)
                         WebEngineCore
                         WebEngineWidgets)
     endif()
+endif()
 
 # other requirements
 find_package(PkgConfig REQUIRED)
@@ -629,7 +659,7 @@ add_executable(sdrangelbench
 )
 
 target_link_libraries(sdrangelbench
-  Qt5::Multimedia
+  Qt::Multimedia
   sdrbench
   logging
 )
@@ -646,8 +676,8 @@ if (BUILD_GUI)
 
   target_link_libraries(${CMAKE_PROJECT_NAME}
     ${OPENGL_LIBRARIES}
-    Qt5::Widgets
+    Qt::Widgets
-    Qt5::Multimedia
+    Qt::Multimedia
     sdrbase
     sdrgui
     logging
@@ -670,7 +700,7 @@ if (BUILD_SERVER)
     )
 
     target_link_libraries(sdrangelsrv
-        Qt5::Multimedia
+        Qt::Multimedia
         sdrbase
         sdrsrv
         logging

app/main.cpp

@@ -22,8 +22,10 @@
 #include <QStyleFactory>
 #include <QFontDatabase>
 #include <QSysInfo>
+#ifdef __APPLE__
 #include <QGLFormat>
 #include <QSurfaceFormat>
+#endif
 
 #include "loggerwithfile.h"
 #include "mainwindow.h"
@@ -44,7 +46,7 @@ static int runQtApplication(int argc, char* argv[], qtwebapp::LoggerWithFile *lo
     QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); //HiDPI pixmaps
     QCoreApplication::setAttribute(Qt::AA_ShareOpenGLContexts); // Needed for WebGL in QWebEngineView and MainWindow::openGLVersion
 #endif
-#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)) && (QT_VERSION <= QT_VERSION_CHECK(6, 0, 0))
     QApplication::setAttribute(Qt::AA_DisableWindowContextHelpButton);
 #endif
 

cmake/Modules/DeployQt.cmake

@@ -1,6 +1,10 @@
+if (Qt6_FOUND)
+    find_package(Qt6Core REQUIRED)
+else()
     find_package(Qt5Core REQUIRED)
+endif()
 
-get_target_property(_qmake_executable Qt5::qmake IMPORTED_LOCATION)
+get_target_property(_qmake_executable Qt::qmake IMPORTED_LOCATION)
 get_filename_component(_qt_bin_dir "${_qmake_executable}" DIRECTORY)
 
 find_program(WINDEPLOYQT_EXECUTABLE windeployqt HINTS "${_qt_bin_dir}")
@@ -20,7 +24,7 @@ function(windeployqt target bindir qmldir)
     add_custom_command(TARGET ${target} POST_BUILD
         COMMAND "${CMAKE_COMMAND}" -E
             env PATH="${_qt_bin_dir}" "${WINDEPLOYQT_EXECUTABLE}"
-                --verbose 1
+                --verbose 2
                 --no-compiler-runtime
                 --dir "${bindir}"
                 --qmldir "${qmldir}"

cmake/cpack/CMakeLists.txt

@@ -1,5 +1,5 @@
 # Stuff qmake can tell us
-get_target_property (QMAKE_EXECUTABLE Qt5::qmake LOCATION)
+get_target_property (QMAKE_EXECUTABLE Qt::qmake LOCATION)
 function (QUERY_QMAKE VAR RESULT)
   exec_program (${QMAKE_EXECUTABLE} ARGS "-query ${VAR}" RETURN_VALUE return_code OUTPUT_VARIABLE output)
   if (NOT return_code)

httpserver/CMakeLists.txt

@@ -40,8 +40,8 @@ add_library(httpserver SHARED
 )
 
 target_link_libraries(httpserver
-    Qt5::Core
+    Qt::Core
-    Qt5::Network
+    Qt::Network
 )
 
 install(TARGETS httpserver DESTINATION ${INSTALL_LIB_DIR})

logging/CMakeLists.txt

@@ -26,8 +26,8 @@ add_library(logging SHARED
 )
 
 target_link_libraries(logging
-    Qt5::Core
+    Qt::Core
-    Qt5::Network
+    Qt::Network
 )
 
 install(TARGETS logging DESTINATION ${INSTALL_LIB_DIR})

modemm17/CMakeLists.txt

@@ -52,7 +52,7 @@ add_library(modemm17 SHARED
 )
 
 target_link_libraries(modemm17
-    Qt5::Core
+    Qt::Core
 )
 
 install(TARGETS modemm17 DESTINATION ${INSTALL_LIB_DIR})

plugins/channelmimo/beamsteeringcwmod/CMakeLists.txt

@@ -35,7 +35,7 @@ if (NOT SERVER_MODE)
     )
 
     set(TARGET_NAME beamsteeringcwmod)
-    set(TARGET_LIB "Qt5::Widgets")
+    set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
@@ -50,7 +50,7 @@ add_library(${TARGET_NAME} SHARED
 )
 
 target_link_libraries(${TARGET_NAME}
-    Qt5::Core
+    Qt::Core
     ${TARGET_LIB}
 	sdrbase
 	${TARGET_LIB_GUI}

plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmodgui.cpp

@@ -194,7 +194,7 @@ void BeamSteeringCWModGUI::leaveEvent(QEvent*)
     m_channelMarker.setHighlighted(false);
 }
 
-void BeamSteeringCWModGUI::enterEvent(QEvent*)
+void BeamSteeringCWModGUI::enterEvent(EnterEventType*)
 {
     m_channelMarker.setHighlighted(true);
 }

plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmodgui.h

@@ -89,7 +89,7 @@ private:
     void updateAbsoluteCenterFrequency();
 
     void leaveEvent(QEvent*);
-    void enterEvent(QEvent*);
+    void enterEvent(EnterEventType*);
 
     void applyInterpolation();
     void applyPosition();

plugins/channelmimo/doa2/CMakeLists.txt

@@ -39,7 +39,7 @@ if (NOT SERVER_MODE)
     )
 
     set(TARGET_NAME doa2)
-    set(TARGET_LIB "Qt5::Widgets")
+    set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
@@ -54,7 +54,7 @@ add_library(${TARGET_NAME} SHARED
 )
 
 target_link_libraries(${TARGET_NAME}
-    Qt5::Core
+    Qt::Core
     ${TARGET_LIB}
 	sdrbase
 	${TARGET_LIB_GUI}

plugins/channelmimo/doa2/doa2gui.cpp

@@ -260,7 +260,7 @@ void DOA2GUI::leaveEvent(QEvent*)
     m_channelMarker.setHighlighted(false);
 }
 
-void DOA2GUI::enterEvent(QEvent*)
+void DOA2GUI::enterEvent(EnterEventType*)
 {
     m_channelMarker.setHighlighted(true);
 }

plugins/channelmimo/doa2/doa2gui.h

@@ -94,7 +94,7 @@ private:
     void updateDOA();
 
 	void leaveEvent(QEvent*);
-	void enterEvent(QEvent*);
+	void enterEvent(EnterEventType*);
 
 private slots:
     void handleSourceMessages();

plugins/channelmimo/interferometer/CMakeLists.txt

@@ -37,7 +37,7 @@ if (NOT SERVER_MODE)
     )
 
     set(TARGET_NAME interferometer)
-    set(TARGET_LIB "Qt5::Widgets")
+    set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
@@ -52,7 +52,7 @@ add_library(${TARGET_NAME} SHARED
 )
 
 target_link_libraries(${TARGET_NAME}
-    Qt5::Core
+    Qt::Core
     ${TARGET_LIB}
 	sdrbase
 	${TARGET_LIB_GUI}

plugins/channelmimo/interferometer/interferometergui.cpp

@@ -229,7 +229,7 @@ void InterferometerGUI::leaveEvent(QEvent*)
     m_channelMarker.setHighlighted(false);
 }
 
-void InterferometerGUI::enterEvent(QEvent*)
+void InterferometerGUI::enterEvent(EnterEventType*)
 {
     m_channelMarker.setHighlighted(true);
 }

plugins/channelmimo/interferometer/interferometergui.h

@@ -91,7 +91,7 @@ private:
     void updateAbsoluteCenterFrequency();
 
 	void leaveEvent(QEvent*);
-	void enterEvent(QEvent*);
+	void enterEvent(EnterEventType*);
 
 private slots:
     void handleSourceMessages();

plugins/channelrx/CMakeLists.txt

@@ -1,6 +1,6 @@
 project(demod)
 
-if (ENABLE_CHANNELRX_DEMODADSB AND Qt5Quick_FOUND AND Qt5QuickWidgets_FOUND AND Qt5Positioning_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)
     add_subdirectory(demodadsb)
     # add_subdirectory(demodvormc)
 endif()

plugins/channelrx/chanalyzer/CMakeLists.txt

@@ -34,8 +34,8 @@ add_library(${TARGET_NAME} SHARED
 )
 
 target_link_libraries(${TARGET_NAME}
-    Qt5::Core
+    Qt::Core
-    Qt5::Widgets
+    Qt::Widgets
 	sdrbase
 	sdrgui
 )

plugins/channelrx/chanalyzer/chanalyzergui.cpp

@@ -703,7 +703,7 @@ void ChannelAnalyzerGUI::leaveEvent(QEvent* event)
     ChannelGUI::leaveEvent(event);
 }
 
-void ChannelAnalyzerGUI::enterEvent(QEvent* event)
+void ChannelAnalyzerGUI::enterEvent(EnterEventType* event)
 {
 	m_channelMarker.setHighlighted(true);
     ChannelGUI::enterEvent(event);

plugins/channelrx/chanalyzer/chanalyzergui.h

@@ -100,7 +100,7 @@ private:
     void updateAbsoluteCenterFrequency();
 
 	void leaveEvent(QEvent*);
-	void enterEvent(QEvent*);
+	void enterEvent(EnterEventType*);
 
 private slots:
 	void on_deltaFrequency_changed(qint64 value);

plugins/channelrx/demodadsb/CMakeLists.txt

@@ -29,7 +29,7 @@ set(adsb_HEADERS
 include_directories(
     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
     ${Boost_INCLUDE_DIRS}
-    ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
+    ${Qt${QT_DEFAULT_MAJOR_VERSION}Gui_PRIVATE_INCLUDE_DIRS}
 )
 
 if(NOT SERVER_MODE)
@@ -61,7 +61,7 @@ if(NOT SERVER_MODE)
     )
 
     set(TARGET_NAME demodadsb)
-    set(TARGET_LIB Qt5::Widgets Qt5::Quick Qt5::QuickWidgets Qt5::Positioning Qt5::TextToSpeech)
+    set(TARGET_LIB Qt::Widgets Qt::Quick Qt::QuickWidgets Qt::Positioning Qt::TextToSpeech)
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
@@ -81,7 +81,7 @@ endif()
 
 target_link_libraries(${TARGET_NAME}
     Boost::disable_autolinking
-    Qt5::Core
+    Qt::Core
     ${TARGET_LIB}
     sdrbase
     ${TARGET_LIB_GUI}

plugins/channelrx/demodadsb/adsbdemodgui.cpp

@@ -1947,7 +1947,7 @@ void ADSBDemodGUI::decodeCommB(const QByteArray data, const QDateTime dateTime,
         }
         airlineRegistration[2] = '\0';
         QString airlineRegistrationString = QString(airlineRegistration).trimmed();
-        bool airlineRegistrationInvalid = QString(airlineRegistrationStatus).contains('#') || !QChar::isLetter(c[0]) || !QChar::isLetter(c[1]);
+        bool airlineRegistrationInvalid = QString(airlineRegistrationString).contains('#') || !QChar::isLetter(c[0]) || !QChar::isLetter(c[1]);
         bool airlineRegistrationInconsistent = !airlineRegistrationStatus && (c[0] || c[1]);
 
         bool bds_2_1 = !aircraftRegistrationInvalid && !aircraftRegistrationInconsistent && !airlineRegistrationInvalid && !airlineRegistrationInconsistent;
@@ -4599,6 +4599,11 @@ void ADSBDemodGUI::applyMapSettings()
     Real stationAltitude = MainCore::instance()->getSettings().getAltitude();
 
     QQuickItem *item = ui->map->rootObject();
+    if (!item)
+    {
+        qCritical("ADSBDemodGUI::applyMapSettings: Map not found. Are all required Qt plugins installed?");
+        return;
+    }
 
     QObject *object = item->findChild<QObject*>("map");
     QGeoCoordinate coords;
@@ -5067,7 +5072,7 @@ void ADSBDemodGUI::leaveEvent(QEvent* event)
     ChannelGUI::leaveEvent(event);
 }
 
-void ADSBDemodGUI::enterEvent(QEvent* event)
+void ADSBDemodGUI::enterEvent(EnterEventType* event)
 {
     m_channelMarker.setHighlighted(true);
     ChannelGUI::enterEvent(event);

plugins/channelrx/demodadsb/adsbdemodgui.h

@@ -1016,7 +1016,7 @@ private:
     void applyImportSettings();
 
     void leaveEvent(QEvent*);
-    void enterEvent(QEvent*);
+    void enterEvent(EnterEventType*);
 
 private slots:
     void on_deltaFrequency_changed(qint64 value);

plugins/channelrx/demodadsb/adsbosmtemplateserver.h

@@ -21,6 +21,7 @@
 #include <QTcpServer>
 #include <QTcpSocket>
 #include <QDebug>
+#include <QRegularExpression>
 
 // Redirect OSM maps so we can support Street, Satellite and an Aviation map (CartoDB position)
 class ADSBOSMTemplateServer : public QTcpServer
@@ -56,7 +57,7 @@ private slots:
         if (socket->canReadLine())
         {
             QString line = socket->readLine();
-            QStringList tokens = QString(line).split(QRegExp("[ \r\n][ \r\n]*"));
+            QStringList tokens = QString(line).split(QRegularExpression("[ \r\n][ \r\n]*"));
             if (tokens[0] == "GET")
             {
                 bool hires = tokens[1].contains("hires");

plugins/channelrx/demodais/CMakeLists.txt

@@ -34,7 +34,7 @@ if(NOT SERVER_MODE)
     )
 
     set(TARGET_NAME demodais)
-    set(TARGET_LIB "Qt5::Widgets")
+    set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
@@ -49,7 +49,7 @@ add_library(${TARGET_NAME} SHARED
 )
 
 target_link_libraries(${TARGET_NAME}
-    Qt5::Core
+    Qt::Core
     ${TARGET_LIB}
     sdrbase
     ${TARGET_LIB_GUI}

plugins/channelrx/demodais/aisdemodgui.cpp

@@ -632,7 +632,7 @@ void AISDemodGUI::leaveEvent(QEvent* event)
     ChannelGUI::leaveEvent(event);
 }
 
-void AISDemodGUI::enterEvent(QEvent* event)
+void AISDemodGUI::enterEvent(EnterEventType* event)
 {
     m_channelMarker.setHighlighted(true);
     ChannelGUI::enterEvent(event);

plugins/channelrx/demodais/aisdemodgui.h

@@ -104,7 +104,7 @@ private:
     void updateAbsoluteCenterFrequency();
 
     void leaveEvent(QEvent*);
-    void enterEvent(QEvent*);
+    void enterEvent(EnterEventType*);
 
     void resizeTable();
     QAction *createCheckableItem(QString& text, int idx, bool checked, const char *slot);

plugins/channelrx/demodam/CMakeLists.txt

@@ -38,7 +38,7 @@ if(NOT SERVER_MODE)
     )
 
     set(TARGET_NAME demodam)
-    set(TARGET_LIB "Qt5::Widgets")
+    set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
@@ -53,7 +53,7 @@ add_library(${TARGET_NAME} SHARED
 )
 
 target_link_libraries(${TARGET_NAME}
-    Qt5::Core
+    Qt::Core
     ${TARGET_LIB}
 	sdrbase
 	${TARGET_LIB_GUI}

plugins/channelrx/demodam/amdemodgui.cpp

@@ -404,7 +404,7 @@ void AMDemodGUI::leaveEvent(QEvent* event)
     ChannelGUI::leaveEvent(event);
 }
 
-void AMDemodGUI::enterEvent(QEvent* event)
+void AMDemodGUI::enterEvent(EnterEventType* event)
 {
 	m_channelMarker.setHighlighted(true);
     ChannelGUI::enterEvent(event);

plugins/channelrx/demodam/amdemodgui.h

@@ -79,7 +79,7 @@ private:
     void updateAbsoluteCenterFrequency();
 
 	void leaveEvent(QEvent*);
-	void enterEvent(QEvent*);
+	void enterEvent(EnterEventType*);
 
 private slots:
 	void on_deltaFrequency_changed(qint64 value);

plugins/channelrx/demodapt/CMakeLists.txt

@@ -45,7 +45,7 @@ if(NOT SERVER_MODE)
     )
 
     set(TARGET_NAME demodapt)
-    set(TARGET_LIB "Qt5::Widgets")
+    set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
@@ -68,7 +68,7 @@ if(SGP4_EXTERNAL)
 endif()
 
 target_link_libraries(${TARGET_NAME}
-    Qt5::Core
+    Qt::Core
     ${TARGET_LIB}
     sdrbase
     ${TARGET_LIB_GUI}

plugins/channelrx/demodapt/aptdemodgui.cpp

@@ -827,7 +827,7 @@ void APTDemodGUI::leaveEvent(QEvent* event)
     ChannelGUI::leaveEvent(event);
 }
 
-void APTDemodGUI::enterEvent(QEvent* event)
+void APTDemodGUI::enterEvent(EnterEventType* event)
 {
     m_channelMarker.setHighlighted(true);
     ChannelGUI::enterEvent(event);

plugins/channelrx/demodapt/aptdemodgui.h

@@ -133,7 +133,7 @@ private:
     void resetDecoder();
 
     void leaveEvent(QEvent*);
-    void enterEvent(QEvent*);
+    void enterEvent(EnterEventType*);
 
 private slots:
     void on_deltaFrequency_changed(qint64 value);

plugins/channelrx/demodapt/aptdemodimageworker.cpp

@@ -486,7 +486,7 @@ QRgb APTDemodImageWorker::findNearest(const QImage &image, double latitude, doub
         yMin = std::max(yMin, yStartPostCrop);
         yMax = std::min(yMax, yEndPostCrop);
         xMin = std::max(xMin, 0);
-        xMax = std::min(xMax, m_pixelCoords[0].size());
+        xMax = std::min(xMax, (int)m_pixelCoords[0].size());
     }
 
     const int ySize = yEndPostCrop-1;

plugins/channelrx/demodatv/CMakeLists.txt

@@ -34,8 +34,8 @@ add_library(${TARGET_NAME} SHARED
 )
 
 target_link_libraries(${TARGET_NAME}
-    Qt5::Core
+    Qt::Core
-    Qt5::Widgets
+    Qt::Widgets
 	sdrbase
 	sdrgui
 )

plugins/channelrx/demodatv/atvdemodgui.cpp

@@ -415,7 +415,7 @@ void ATVDemodGUI::leaveEvent(QEvent* event)
     ChannelGUI::leaveEvent(event);
 }
 
-void ATVDemodGUI::enterEvent(QEvent* event)
+void ATVDemodGUI::enterEvent(EnterEventType* event)
 {
     m_channelMarker.setHighlighted(true);
     ChannelGUI::enterEvent(event);

plugins/channelrx/demodatv/atvdemodgui.h

@@ -103,7 +103,7 @@ private:
     void updateAbsoluteCenterFrequency();
 
 	void leaveEvent(QEvent*);
-	void enterEvent(QEvent*);
+	void enterEvent(EnterEventType*);
 
 private slots:
     void handleSourceMessages();

plugins/channelrx/demodbfm/CMakeLists.txt

@@ -45,7 +45,7 @@ if(NOT SERVER_MODE)
     )
 
     set(TARGET_NAME demodbfm)
-    set(TARGET_LIB "Qt5::Widgets")
+    set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
@@ -60,7 +60,7 @@ add_library(${TARGET_NAME} SHARED
 )
 
 target_link_libraries(${TARGET_NAME}
-    Qt5::Core
+    Qt::Core
     ${TARGET_LIB}
 	sdrbase
     ${TARGET_LIB_GUI}

plugins/channelrx/demodbfm/bfmdemodgui.cpp

@@ -509,7 +509,7 @@ void BFMDemodGUI::leaveEvent(QEvent* event)
     ChannelGUI::leaveEvent(event);
 }
 
-void BFMDemodGUI::enterEvent(QEvent* event)
+void BFMDemodGUI::enterEvent(EnterEventType* event)
 {
 	m_channelMarker.setHighlighted(true);
     ChannelGUI::enterEvent(event);

plugins/channelrx/demodbfm/bfmdemodgui.h

@@ -97,7 +97,7 @@ private:
     void updateAbsoluteCenterFrequency();
 
 	void leaveEvent(QEvent*);
-	void enterEvent(QEvent*);
+	void enterEvent(EnterEventType*);
 
 	void changeFrequency(qint64 f);
 

plugins/channelrx/demodchirpchat/CMakeLists.txt

@@ -41,7 +41,7 @@ if(NOT SERVER_MODE)
         chirpchatdemodgui.h
     )
     set(TARGET_NAME demodchirpchat)
-    set(TARGET_LIB "Qt5::Widgets")
+    set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
@@ -56,7 +56,7 @@ add_library(${TARGET_NAME} SHARED
 )
 
 target_link_libraries(${TARGET_NAME}
-    Qt5::Core
+    Qt::Core
     ${TARGET_LIB}
 	sdrbase
 	${TARGET_LIB_GUI}

plugins/channelrx/demoddab/CMakeLists.txt

@@ -39,7 +39,7 @@ if(NOT SERVER_MODE)
     )
 
     set(TARGET_NAME demoddab)
-    set(TARGET_LIB "Qt5::Widgets")
+    set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
@@ -54,7 +54,7 @@ add_library(${TARGET_NAME} SHARED
 )
 
 target_link_libraries(${TARGET_NAME}
-    Qt5::Core
+    Qt::Core
     ${TARGET_LIB}
     sdrbase
     ${TARGET_LIB_GUI}

plugins/channelrx/demoddab/dabdemodgui.cpp

@@ -595,7 +595,7 @@ void DABDemodGUI::leaveEvent(QEvent* event)
     ChannelGUI::leaveEvent(event);
 }
 
-void DABDemodGUI::enterEvent(QEvent* event)
+void DABDemodGUI::enterEvent(EnterEventType* event)
 {
     m_channelMarker.setHighlighted(true);
     ChannelGUI::enterEvent(event);

plugins/channelrx/demoddab/dabdemodgui.h

@@ -99,7 +99,7 @@ private:
     void updateAbsoluteCenterFrequency();
 
     void leaveEvent(QEvent*);
-    void enterEvent(QEvent*);
+    void enterEvent(EnterEventType*);
     void resetService();
     void clearProgram();
     void resizeTable();

plugins/channelrx/demoddatv/CMakeLists.txt

@@ -77,10 +77,10 @@ add_library(${TARGET_NAME} SHARED
 )
 
 target_link_libraries(${TARGET_NAME}
-    Qt5::Core
+    Qt::Core
-    Qt5::Widgets
+    Qt::Widgets
-    Qt5::Multimedia
+    Qt::Multimedia
-    Qt5::MultimediaWidgets
+    Qt::MultimediaWidgets
     sdrbase
     sdrgui
     ${AVCODEC_LIBRARIES}

plugins/channelrx/demoddatv/datvdemodgui.cpp

@@ -498,7 +498,7 @@ void DATVDemodGUI::leaveEvent(QEvent* event)
     ChannelGUI::leaveEvent(event);
 }
 
-void DATVDemodGUI::enterEvent(QEvent* event)
+void DATVDemodGUI::enterEvent(EnterEventType* event)
 {
     blockApplySettings(true);
     m_channelMarker.setHighlighted(true);

plugins/channelrx/demoddatv/datvdemodgui.h

@@ -148,7 +148,7 @@ private:
     void displayRRCParameters(bool blnVisible);
 
 	void leaveEvent(QEvent*);
-	void enterEvent(QEvent*);
+	void enterEvent(EnterEventType*);
     bool handleMessage(const Message& objMessage);
     void makeUIConnections();
     void updateAbsoluteCenterFrequency();

plugins/channelrx/demoddatv/leansdr/generic.h

@@ -37,6 +37,8 @@ namespace leansdr
 // Simple blocks
 //////////////////////////////////////////////////////////////////////
 
+/* // Commented out, as not needed, as does compile on Windows
+
 // [file_reader] reads raw data from a file descriptor into a [pipebuf].
 // If the file descriptor is seekable, data can be looped.
 
@@ -151,6 +153,8 @@ struct file_reader : runnable
     pipewriter<T> out;
 };
 
+*/
+
 // [file_writer] writes raw data from a [pipebuf] to a file descriptor.
 
 template <typename T>

plugins/channelrx/demoddsd/CMakeLists.txt

@@ -43,7 +43,7 @@ if(NOT SERVER_MODE)
     )
 
     set(TARGET_NAME demoddsd)
-    set(TARGET_LIB "Qt5::Widgets")
+    set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
@@ -62,7 +62,7 @@ if(LIBDSDCC_EXTERNAL)
 endif()
 
 target_link_libraries(${TARGET_NAME}
-    Qt5::Core
+    Qt::Core
     ${TARGET_LIB}
 	sdrbase
 	${TARGET_LIB_GUI}

plugins/channelrx/demoddsd/dsddemodgui.cpp

@@ -571,7 +571,7 @@ void DSDDemodGUI::leaveEvent(QEvent* event)
     ChannelGUI::leaveEvent(event);
 }
 
-void DSDDemodGUI::enterEvent(QEvent* event)
+void DSDDemodGUI::enterEvent(EnterEventType* event)
 {
 	m_channelMarker.setHighlighted(true);
     ChannelGUI::enterEvent(event);

plugins/channelrx/demoddsd/dsddemodgui.h

@@ -122,7 +122,7 @@ private:
     void updateAbsoluteCenterFrequency();
 
 	void leaveEvent(QEvent*);
-	void enterEvent(QEvent*);
+	void enterEvent(EnterEventType*);
 
 private slots:
     void on_deltaFrequency_changed(qint64 value);

plugins/channelrx/demodfreedv/CMakeLists.txt

@@ -34,7 +34,7 @@ if(NOT SERVER_MODE)
         freedvdemodgui.h
     )
     set(TARGET_NAME demodfreedv)
-    set(TARGET_LIB "Qt5::Widgets")
+    set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
@@ -53,7 +53,7 @@ if(CODEC2_EXTERNAL)
 endif()
 
 target_link_libraries(${TARGET_NAME}
-    Qt5::Core
+    Qt::Core
     ${TARGET_LIB}
 	sdrbase
 	${TARGET_LIB_GUI}

plugins/channelrx/demodfreedv/freedvdemodgui.cpp

@@ -422,7 +422,7 @@ void FreeDVDemodGUI::leaveEvent(QEvent* event)
     ChannelGUI::leaveEvent(event);
 }
 
-void FreeDVDemodGUI::enterEvent(QEvent* event)
+void FreeDVDemodGUI::enterEvent(EnterEventType* event)
 {
 	m_channelMarker.setHighlighted(true);
     ChannelGUI::enterEvent(event);

plugins/channelrx/demodfreedv/freedvdemodgui.h

@@ -104,7 +104,7 @@ private:
     void updateAbsoluteCenterFrequency();
 
 	void leaveEvent(QEvent*);
-	void enterEvent(QEvent*);
+	void enterEvent(EnterEventType*);
 
 private slots:
 	void on_deltaFrequency_changed(qint64 value);

plugins/channelrx/demodm17/CMakeLists.txt

@@ -44,7 +44,7 @@ if(NOT SERVER_MODE)
         m17statustextdialog.h
     )
     set(TARGET_NAME demodm17)
-    set(TARGET_LIB "Qt5::Widgets" Qt5::Charts)
+    set(TARGET_LIB "Qt::Widgets" Qt::Charts)
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
@@ -63,7 +63,7 @@ if(CODEC2_EXTERNAL)
 endif()
 
 target_link_libraries(${TARGET_NAME}
-    Qt5::Core
+    Qt::Core
     ${TARGET_LIB}
 	sdrbase
 	${TARGET_LIB_GUI}

plugins/channelrx/demodm17/m17demodgui.cpp

@@ -612,7 +612,7 @@ void M17DemodGUI::leaveEvent(QEvent* event)
     ChannelGUI::leaveEvent(event);
 }
 
-void M17DemodGUI::enterEvent(QEvent* event)
+void M17DemodGUI::enterEvent(EnterEventType* event)
 {
 	m_channelMarker.setHighlighted(true);
     ChannelGUI::enterEvent(event);

plugins/channelrx/demodm17/m17demodgui.h

@@ -137,7 +137,7 @@ private:
     static float distance(float lat1, float lon1, float lat2, float lon2);
 
 	void leaveEvent(QEvent*);
-	void enterEvent(QEvent*);
+	void enterEvent(EnterEventType*);
 
 private slots:
     void on_deltaFrequency_changed(qint64 value);

plugins/channelrx/demodnfm/CMakeLists.txt

@@ -39,7 +39,7 @@ if(NOT SERVER_MODE)
     )
 
     set(TARGET_NAME demodnfm)
-    set(TARGET_LIB "Qt5::Widgets")
+    set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
@@ -54,7 +54,7 @@ add_library(${TARGET_NAME} SHARED
 )
 
 target_link_libraries(${TARGET_NAME}
-        Qt5::Core
+        Qt::Core
         ${TARGET_LIB}
 	sdrbase
 	${TARGET_LIB_GUI}

plugins/channelrx/demodnfm/nfmdemodgui.cpp

@@ -539,7 +539,7 @@ void NFMDemodGUI::leaveEvent(QEvent* event)
     ChannelGUI::leaveEvent(event);
 }
 
-void NFMDemodGUI::enterEvent(QEvent* event)
+void NFMDemodGUI::enterEvent(EnterEventType* event)
 {
 	m_channelMarker.setHighlighted(true);
     ChannelGUI::enterEvent(event);

plugins/channelrx/demodnfm/nfmdemodgui.h

@@ -79,7 +79,7 @@ private:
     void updateAbsoluteCenterFrequency();
 
 	void leaveEvent(QEvent*);
-	void enterEvent(QEvent*);
+	void enterEvent(EnterEventType*);
 
 private slots:
 	void on_deltaFrequency_changed(qint64 value);

plugins/channelrx/demodpacket/CMakeLists.txt

@@ -34,7 +34,7 @@ if(NOT SERVER_MODE)
     )
 
     set(TARGET_NAME demodpacket)
-    set(TARGET_LIB "Qt5::Widgets" Qt5::Quick Qt5::QuickWidgets Qt5::Positioning)
+    set(TARGET_LIB "Qt::Widgets" Qt::Quick Qt::QuickWidgets Qt::Positioning)
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
@@ -49,7 +49,7 @@ add_library(${TARGET_NAME} SHARED
 )
 
 target_link_libraries(${TARGET_NAME}
-    Qt5::Core
+    Qt::Core
     ${TARGET_LIB}
     sdrbase
     ${TARGET_LIB_GUI}

plugins/channelrx/demodpacket/packetdemodgui.cpp

@@ -576,7 +576,7 @@ void PacketDemodGUI::leaveEvent(QEvent* event)
     ChannelGUI::leaveEvent(event);
 }
 
-void PacketDemodGUI::enterEvent(QEvent* event)
+void PacketDemodGUI::enterEvent(EnterEventType* event)
 {
     m_channelMarker.setHighlighted(true);
     ChannelGUI::enterEvent(event);

plugins/channelrx/demodpacket/packetdemodgui.h

@@ -103,7 +103,7 @@ private:
     void updateAbsoluteCenterFrequency();
 
     void leaveEvent(QEvent*);
-    void enterEvent(QEvent*);
+    void enterEvent(EnterEventType*);
 
     void resizeTable();
     QAction *createCheckableItem(QString& text, int idx, bool checked);

plugins/channelrx/demodpager/CMakeLists.txt

@@ -37,7 +37,7 @@ if(NOT SERVER_MODE)
     )
 
     set(TARGET_NAME demodpager)
-    set(TARGET_LIB "Qt5::Widgets")
+    set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
@@ -52,7 +52,7 @@ add_library(${TARGET_NAME} SHARED
 )
 
 target_link_libraries(${TARGET_NAME}
-    Qt5::Core
+    Qt::Core
     ${TARGET_LIB}
     sdrbase
     ${TARGET_LIB_GUI}

plugins/channelrx/demodpager/pagerdemodgui.cpp

@@ -665,7 +665,7 @@ void PagerDemodGUI::leaveEvent(QEvent* event)
     ChannelGUI::leaveEvent(event);
 }
 
-void PagerDemodGUI::enterEvent(QEvent* event)
+void PagerDemodGUI::enterEvent(EnterEventType* event)
 {
     m_channelMarker.setHighlighted(true);
     ChannelGUI::enterEvent(event);

plugins/channelrx/demodpager/pagerdemodgui.h

@@ -100,7 +100,7 @@ private:
     void updateAbsoluteCenterFrequency();
 
     void leaveEvent(QEvent*);
-    void enterEvent(QEvent*);
+    void enterEvent(EnterEventType*);
 
     void resizeTable();
     QAction *createCheckableItem(QString& text, int idx, bool checked, const char *slot);

plugins/channelrx/demodpager/pagerdemodsink.cpp

@@ -274,12 +274,12 @@ void PagerDemodSink::decodeBatch()
                 if (getMessageQueueToChannel())
                 {
                     // Convert from 7-bit to UTF-8 using user specified encoding
-                    for (int i = 0; i < m_alphaMessage; i++)
+                    for (int i = 0; i < m_alphaMessage.size(); i++)
                     {
                         QChar c = m_alphaMessage[i];
                         int idx = m_settings.m_sevenbit.indexOf(c.toLatin1());
                         if (idx >= 0) {
-                            c = m_settings.m_unicode[idx];
+                            c = QChar(m_settings.m_unicode[idx]);
                         }
                         m_alphaMessage[i] = c;
                     }

plugins/channelrx/demodradiosonde/CMakeLists.txt

@@ -34,7 +34,7 @@ if(NOT SERVER_MODE)
     )
 
     set(TARGET_NAME demodradiosonde)
-    set(TARGET_LIB "Qt5::Widgets")
+    set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
@@ -49,7 +49,7 @@ add_library(${TARGET_NAME} SHARED
 )
 
 target_link_libraries(${TARGET_NAME}
-    Qt5::Core
+    Qt::Core
     ${TARGET_LIB}
     sdrbase
     ${TARGET_LIB_GUI}

plugins/channelrx/demodradiosonde/radiosondedemodgui.cpp

@@ -769,7 +769,7 @@ void RadiosondeDemodGUI::leaveEvent(QEvent* event)
     ChannelGUI::leaveEvent(event);
 }
 
-void RadiosondeDemodGUI::enterEvent(QEvent* event)
+void RadiosondeDemodGUI::enterEvent(EnterEventType* event)
 {
     m_channelMarker.setHighlighted(true);
     ChannelGUI::enterEvent(event);

plugins/channelrx/demodradiosonde/radiosondedemodgui.h

@@ -102,7 +102,7 @@ private:
     void updateAbsoluteCenterFrequency();
 
     void leaveEvent(QEvent*);
-    void enterEvent(QEvent*);
+    void enterEvent(EnterEventType*);
 
     void resizeTable();
     QAction *createCheckableItem(QString& text, int idx, bool checked, const char *slot);

plugins/channelrx/demodssb/CMakeLists.txt

@@ -33,7 +33,7 @@ if(NOT SERVER_MODE)
         ssbdemodgui.h
     )
     set(TARGET_NAME demodssb)
-    set(TARGET_LIB "Qt5::Widgets")
+    set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
@@ -48,7 +48,7 @@ add_library(${TARGET_NAME} SHARED
 )
 
 target_link_libraries(${TARGET_NAME}
-    Qt5::Core
+    Qt::Core
     ${TARGET_LIB}
 	sdrbase
 	${TARGET_LIB_GUI}

plugins/channelrx/demodssb/ssbdemodgui.cpp

@@ -667,7 +667,7 @@ void SSBDemodGUI::leaveEvent(QEvent* event)
     ChannelGUI::leaveEvent(event);
 }
 
-void SSBDemodGUI::enterEvent(QEvent* event)
+void SSBDemodGUI::enterEvent(EnterEventType* event)
 {
 	m_channelMarker.setHighlighted(true);
     ChannelGUI::enterEvent(event);

plugins/channelrx/demodssb/ssbdemodgui.h

@@ -89,7 +89,7 @@ private:
     void updateAbsoluteCenterFrequency();
 
 	void leaveEvent(QEvent*);
-	void enterEvent(QEvent*);
+	void enterEvent(EnterEventType*);
 
 private slots:
 	void on_deltaFrequency_changed(qint64 value);

plugins/channelrx/demodvor/CMakeLists.txt

@@ -36,7 +36,7 @@ if(NOT SERVER_MODE)
     )
 
     set(TARGET_NAME demodvor)
-    set(TARGET_LIB "Qt5::Widgets")
+    set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
@@ -51,7 +51,7 @@ add_library(${TARGET_NAME} SHARED
 )
 
 target_link_libraries(${TARGET_NAME}
-    Qt5::Core
+    Qt::Core
     ${TARGET_LIB}
     sdrbase
     ${TARGET_LIB_GUI}

plugins/channelrx/demodvor/vordemodgui.cpp

@@ -395,7 +395,7 @@ void VORDemodGUI::leaveEvent(QEvent* event)
     ChannelGUI::leaveEvent(event);
 }
 
-void VORDemodGUI::enterEvent(QEvent* event)
+void VORDemodGUI::enterEvent(EnterEventType* event)
 {
     m_channelMarker.setHighlighted(true);
     ChannelGUI::enterEvent(event);

plugins/channelrx/demodvor/vordemodgui.h

@@ -91,7 +91,7 @@ private:
     void updateAbsoluteCenterFrequency();
 
     void leaveEvent(QEvent*);
-    void enterEvent(QEvent*);
+    void enterEvent(EnterEventType*);
 
 private slots:
 	void on_deltaFrequency_changed(qint64 value);

plugins/channelrx/demodvormc/CMakeLists.txt

@@ -41,7 +41,7 @@ if(NOT SERVER_MODE)
     )
 
     set(TARGET_NAME demodvormc)
-    set(TARGET_LIB "Qt5::Widgets" Qt5::Quick Qt5::QuickWidgets Qt5::Positioning)
+    set(TARGET_LIB "Qt::Widgets" Qt::Quick Qt::QuickWidgets Qt::Positioning)
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
@@ -56,7 +56,7 @@ add_library(${TARGET_NAME} SHARED
 )
 
 target_link_libraries(${TARGET_NAME}
-    Qt5::Core
+    Qt::Core
     ${TARGET_LIB}
     sdrbase
     ${TARGET_LIB_GUI}

plugins/channelrx/demodvormc/vordemodmcgui.cpp

@@ -1353,7 +1353,7 @@ void VORDemodMCGUI::leaveEvent(QEvent* event)
     ChannelGUI::leaveEvent(event);
 }
 
-void VORDemodMCGUI::enterEvent(QEvent* event)
+void VORDemodMCGUI::enterEvent(EnterEventType* event)
 {
     m_channelMarker.setHighlighted(true);
     ChannelGUI::enterEvent(event);

plugins/channelrx/demodvormc/vordemodmcgui.h

@@ -269,7 +269,7 @@ private:
     void updateAbsoluteCenterFrequency();
 
     void leaveEvent(QEvent*);
-    void enterEvent(QEvent*);
+    void enterEvent(EnterEventType*);
 
     void resizeTable();
     QAction *createCheckableItem(QString& text, int idx, bool checked);

plugins/channelrx/demodwfm/CMakeLists.txt

@@ -34,7 +34,7 @@ if(NOT SERVER_MODE)
     )
 
     set(TARGET_NAME demodwfm)
-    set(TARGET_LIB "Qt5::Widgets")
+    set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
@@ -49,7 +49,7 @@ add_library(${TARGET_NAME} SHARED
 )
 
 target_link_libraries(${TARGET_NAME}
-    Qt5::Core
+    Qt::Core
     ${TARGET_LIB}
 	sdrbase
 	${TARGET_LIB_GUI}

plugins/channelrx/demodwfm/wfmdemodgui.cpp

@@ -323,7 +323,7 @@ void WFMDemodGUI::leaveEvent(QEvent* event)
     ChannelGUI::leaveEvent(event);
 }
 
-void WFMDemodGUI::enterEvent(QEvent* event)
+void WFMDemodGUI::enterEvent(EnterEventType* event)
 {
 	m_channelMarker.setHighlighted(true);
     ChannelGUI::enterEvent(event);

plugins/channelrx/demodwfm/wfmdemodgui.h

@@ -73,7 +73,7 @@ private:
     void updateAbsoluteCenterFrequency();
 
 	void leaveEvent(QEvent*);
-	void enterEvent(QEvent*);
+	void enterEvent(EnterEventType*);
 
 private slots:
 	void on_deltaFrequency_changed(qint64 value);

plugins/channelrx/filesink/CMakeLists.txt

@@ -36,7 +36,7 @@ if(NOT SERVER_MODE)
         filesinkgui.h
     )
     set(TARGET_NAME filesink)
-    set(TARGET_LIB "Qt5::Widgets")
+    set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
@@ -51,7 +51,7 @@ add_library(${TARGET_NAME} SHARED
 )
 
 target_link_libraries(${TARGET_NAME}
-    Qt5::Core
+    Qt::Core
     ${TARGET_LIB}
 	sdrbase
 	${TARGET_LIB_GUI}

plugins/channelrx/filesink/filesinkgui.cpp

@@ -314,7 +314,7 @@ void FileSinkGUI::leaveEvent(QEvent* event)
     ChannelGUI::leaveEvent(event);
 }
 
-void FileSinkGUI::enterEvent(QEvent* event)
+void FileSinkGUI::enterEvent(EnterEventType* event)
 {
     m_channelMarker.setHighlighted(true);
     ChannelGUI::enterEvent(event);

plugins/channelrx/filesink/filesinkgui.h

@@ -103,7 +103,7 @@ private:
     void updateAbsoluteCenterFrequency();
 
     void leaveEvent(QEvent*);
-    void enterEvent(QEvent*);
+    void enterEvent(EnterEventType*);
 
 private slots:
     void handleSourceMessages();

plugins/channelrx/freqtracker/CMakeLists.txt

@@ -37,7 +37,7 @@ if(NOT SERVER_MODE)
     )
 
     set(TARGET_NAME freqtracker)
-    set(TARGET_LIB "Qt5::Widgets")
+    set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
@@ -52,7 +52,7 @@ add_library(${TARGET_NAME} SHARED
 )
 
 target_link_libraries(${TARGET_NAME}
-        Qt5::Core
+        Qt::Core
         ${TARGET_LIB}
 	sdrbase
 	${TARGET_LIB_GUI}

plugins/channelrx/freqtracker/freqtrackergui.cpp

@@ -471,7 +471,7 @@ void FreqTrackerGUI::leaveEvent(QEvent* event)
     ChannelGUI::leaveEvent(event);
 }
 
-void FreqTrackerGUI::enterEvent(QEvent* event)
+void FreqTrackerGUI::enterEvent(EnterEventType* event)
 {
 	m_channelMarker.setHighlighted(true);
     ChannelGUI::enterEvent(event);

plugins/channelrx/freqtracker/freqtrackergui.h

@@ -96,7 +96,7 @@ private:
     void updateAbsoluteCenterFrequency();
 
 	void leaveEvent(QEvent*);
-	void enterEvent(QEvent*);
+	void enterEvent(EnterEventType*);
 
 private slots:
 	void on_deltaFrequency_changed(qint64 value);

plugins/channelrx/localsink/CMakeLists.txt

@@ -36,7 +36,7 @@ if(NOT SERVER_MODE)
         localsinkgui.h
     )
     set(TARGET_NAME localsink)
-    set(TARGET_LIB "Qt5::Widgets")
+    set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
@@ -51,7 +51,7 @@ add_library(${TARGET_NAME} SHARED
 )
 
 target_link_libraries(${TARGET_NAME}
-    Qt5::Core
+    Qt::Core
     ${TARGET_LIB}
 	sdrbase
 	${TARGET_LIB_GUI}

plugins/channelrx/localsink/localsinkgui.cpp

@@ -231,7 +231,7 @@ void LocalSinkGUI::leaveEvent(QEvent* event)
     ChannelGUI::leaveEvent(event);
 }
 
-void LocalSinkGUI::enterEvent(QEvent* event)
+void LocalSinkGUI::enterEvent(EnterEventType* event)
 {
     m_channelMarker.setHighlighted(true);
     ChannelGUI::enterEvent(event);

plugins/channelrx/localsink/localsinkgui.h

@@ -91,7 +91,7 @@ private:
     void updateAbsoluteCenterFrequency();
 
     void leaveEvent(QEvent*);
-    void enterEvent(QEvent*);
+    void enterEvent(EnterEventType*);
 
     void applyDecimation();
     void applyPosition();

plugins/channelrx/noisefigure/CMakeLists.txt

@@ -41,7 +41,7 @@ if(NOT SERVER_MODE)
     )
 
     set(TARGET_NAME noisefigure)
-    set(TARGET_LIB "Qt5::Widgets" Qt5::Charts)
+    set(TARGET_LIB "Qt::Widgets" Qt::Charts)
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
@@ -56,7 +56,7 @@ add_library(${TARGET_NAME} SHARED
 )
 
 target_link_libraries(${TARGET_NAME}
-    Qt5::Core
+    Qt::Core
     ${TARGET_LIB}
     sdrbase
     ${TARGET_LIB_GUI}

plugins/channelrx/noisefigure/noisefigure.cpp

@@ -264,7 +264,7 @@ void NoiseFigure::nextState()
         if (m_settings.m_sweepSpec == NoiseFigureSettings::LIST)
         {
             // Create list of sweep values from string
-            QRegExp separator("[( |,|\t|)]");
+            QRegularExpression separator("[( |,|\t|)]");
             QStringList valueStrings = m_settings.m_sweepList.trimmed().split(separator);
             m_values.clear();
             for (int i = 0; i < valueStrings.size(); i++)

plugins/channelrx/noisefigure/noisefigureenrdialog.h

@@ -23,7 +23,9 @@
 #include "ui_noisefigureenrdialog.h"
 #include "noisefiguresettings.h"
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 using namespace QtCharts;
+#endif
 
 class NoiseFigureENRDialog : public QDialog {
     Q_OBJECT

plugins/channelrx/noisefigure/noisefiguregui.cpp

@@ -765,7 +765,7 @@ void NoiseFigureGUI::leaveEvent(QEvent* event)
     ChannelGUI::leaveEvent(event);
 }
 
-void NoiseFigureGUI::enterEvent(QEvent* event)
+void NoiseFigureGUI::enterEvent(EnterEventType* event)
 {
     m_channelMarker.setHighlighted(true);
     ChannelGUI::enterEvent(event);

plugins/channelrx/noisefigure/noisefiguregui.h

@@ -42,7 +42,9 @@ namespace Ui {
     class NoiseFigureGUI;
 }
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 using namespace QtCharts;
+#endif
 
 class NoiseFigureGUI : public ChannelGUI {
     Q_OBJECT
@@ -107,7 +109,7 @@ private:
     void updateAbsoluteCenterFrequency();
 
     void leaveEvent(QEvent*);
-    void enterEvent(QEvent*);
+    void enterEvent(EnterEventType*);
 
     void resizeTable();
     QAction *createCheckableItem(QString& text, int idx, bool checked, const char *slot);

plugins/channelrx/radioastronomy/CMakeLists.txt

@@ -43,7 +43,7 @@ if(NOT SERVER_MODE)
     )
 
     set(TARGET_NAME radioastronomy)
-    set(TARGET_LIB "Qt5::Widgets" Qt5::Charts)
+    set(TARGET_LIB "Qt::Widgets" Qt::Charts)
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
@@ -58,7 +58,7 @@ add_library(${TARGET_NAME} SHARED
 )
 
 target_link_libraries(${TARGET_NAME}
-    Qt5::Core
+    Qt::Core
     ${TARGET_LIB}
     sdrbase
     ${TARGET_LIB_GUI}

plugins/channelrx/radioastronomy/radioastronomygui.cpp

@@ -2552,7 +2552,7 @@ void RadioAstronomyGUI::leaveEvent(QEvent* event)
     ChannelGUI::leaveEvent(event);
 }
 
-void RadioAstronomyGUI::enterEvent(QEvent* event)
+void RadioAstronomyGUI::enterEvent(EnterEventType* event)
 {
     m_channelMarker.setHighlighted(true);
     ChannelGUI::enterEvent(event);

plugins/channelrx/radioastronomy/radioastronomygui.h

@@ -49,7 +49,9 @@ namespace Ui {
 }
 class RadioAstronomyGUI;
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 using namespace QtCharts;
+#endif
 
 class RadioAstronomyGUI : public ChannelGUI {
     Q_OBJECT
@@ -450,7 +452,7 @@ private:
     int powerYUnitsToIndex(RadioAstronomySettings::PowerYUnits units);
 
     void leaveEvent(QEvent*);
-    void enterEvent(QEvent*);
+    void enterEvent(EnterEventType*);
 
     void resizePowerTable();
     void resizePowerMarkerTable();

plugins/channelrx/radioclock/CMakeLists.txt

@@ -34,7 +34,7 @@ if(NOT SERVER_MODE)
     )
 
     set(TARGET_NAME radioclock)
-    set(TARGET_LIB "Qt5::Widgets")
+    set(TARGET_LIB "Qt::Widgets")
     set(TARGET_LIB_GUI "sdrgui")
     set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 else()
@@ -49,7 +49,7 @@ add_library(${TARGET_NAME} SHARED
 )
 
 target_link_libraries(${TARGET_NAME}
-    Qt5::Core
+    Qt::Core
     ${TARGET_LIB}
     sdrbase
     ${TARGET_LIB_GUI}