Merge pull request #50664 from m-kuhn/core_no_uitools

m-kuhn · web-flow · commit 5d0f37a62c5c · 2022-10-23T14:25:00.000+02:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -461,7 +461,7 @@ if(WITH_CORE)
       set (HAVE_QT5SERIALPORT TRUE)
   endif()
 
-  find_package(${QT_VERSION_BASE} COMPONENTS Core Gui Widgets Network Xml Svg Concurrent Test UiTools Sql REQUIRED)
+  find_package(${QT_VERSION_BASE} COMPONENTS Core Gui Widgets Network Xml Svg Concurrent Test Sql REQUIRED)
   if (BUILD_WITH_QT6)
     find_package(${QT_VERSION_BASE} COMPONENTS Core5Compat REQUIRED)
   else()
diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
@@ -365,6 +365,7 @@ if (WITH_3D)
   )
 endif()
 
+find_package(${QT_VERSION_BASE} COMPONENTS UiTools REQUIRED)
 
 set (WITH_QWTPOLAR FALSE CACHE BOOL "Determines whether QwtPolar should be built")
 
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
@@ -1370,11 +1370,7 @@ set(QGIS_GUI_PRIVATE_HDRS
   attributetable/qgsfeaturefilterwidget_p.h
 )
 
-if (BUILD_WITH_QT6)
-  find_package(Qt6 COMPONENTS Qml QuickWidgets REQUIRED)
-else()
-  find_package(Qt5 COMPONENTS Qml QuickWidgets REQUIRED)
-endif()
+find_package(${QT_VERSION_BASE} COMPONENTS Qml QuickWidgets UiTools REQUIRED)
 
 if(${QT_VERSION_BASE}Qml_FOUND)
   add_definitions(-DWITH_QML)

Original file line number	Diff line number	Diff line change
`@@ -365,6 +365,7 @@ if (WITH_3D)`
`365`	`365`	`)`
`366`	`366`	`endif()`
`367`	`367`
	`368`	`+find_package(${QT_VERSION_BASE} COMPONENTS UiTools REQUIRED)`
`368`	`369`
`369`	`370`	`set (WITH_QWTPOLAR FALSE CACHE BOOL "Determines whether QwtPolar should be built")`
`370`	`371`