Merge pull request #1310 from gqrx-sdr/force-qt-version

Allow the Qt version to be chosen explicitly
gqrx-sdr · Oct 10, 2023 · 92e4257 · 92e4257
2 parents 898d120 + fe5b26e
commit 92e4257
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -122,10 +122,20 @@ else()
 endif()
 
 # 3rd Party Dependency Stuff
-find_package(Qt6 QUIET COMPONENTS Core Network Widgets Svg SvgWidgets)
-if(NOT Qt6_FOUND)
+option(FORCE_QT6 "Force Qt6 to be used" OFF)
+option(FORCE_QT5 "Force Qt5 to be used" OFF)
+
+if(FORCE_QT6)
+    find_package(Qt6 QUIET COMPONENTS Core Network Widgets Svg SvgWidgets)
+elseif(FORCE_QT5)
     find_package(Qt5 REQUIRED COMPONENTS Core Network Widgets Svg)
+else()
+    find_package(Qt6 QUIET COMPONENTS Core Network Widgets Svg SvgWidgets)
+    if(NOT Qt6_FOUND)
+        find_package(Qt5 REQUIRED COMPONENTS Core Network Widgets Svg)
+    endif()
 endif()
+
 include(FindPkgConfig)
 find_package(Gnuradio-osmosdr REQUIRED)
 

diff --git a/resources/news.txt b/resources/news.txt
@@ -1,4 +1,9 @@
 
+    2.17.2: In progress...
+
+       NEW: FORCE_QT6 and FORCE_QT5 CMake options to force Qt version.
+
+
     2.17.1: Released October 9, 2023
 
        NEW: Delete key clears the waterfall.