sync: from linuxdeepin/qt5integration

Synchronize source files from linuxdeepin/qt5integration.

Source-pull-request: linuxdeepin/qt5integration#287

Author: deepin-ci-robot

CMakeLists.txt

@@ -21,12 +21,20 @@ option(ENABLE_COV "Enable code coverage" OFF)
 if(PROJECT_VERSION_MAJOR EQUAL 6)
   set(VERSION_SUFFIX 6)
   find_package(QT NAMES Qt6 REQUIRED COMPONENTS Core)
-  if(Qt6_VERSION VERSION_GREATER_EQUAL 6.10)
-    find_package(Qt6 COMPONENTS CorePrivate GuiPrivate WidgetsPrivate REQUIRED)
+  if(NOT DEFINED QT_VERSION_MAJOR)
+    set(QT_VERSION_MAJOR ${Qt6_VERSION_MAJOR})
+    set(QT_VERSION_MINOR ${Qt6_VERSION_MINOR})
+  endif()
+  if(QT_VERSION_MAJOR GREATER 6 OR (QT_VERSION_MAJOR EQUAL 6 AND QT_VERSION_MINOR GREATER_EQUAL 10))
+    find_package(Qt6 CONFIG REQUIRED COMPONENTS CorePrivate GuiPrivate WidgetsPrivate)
   endif()
 else()
   set(VERSION_SUFFIX)
   find_package(QT NAMES Qt5 REQUIRED COMPONENTS Core)
+  if(NOT DEFINED QT_VERSION_MAJOR)
+    set(QT_VERSION_MAJOR ${Qt5_VERSION_MAJOR})
+    set(QT_VERSION_MINOR ${Qt5_VERSION_MINOR})
+  endif()
 endif()
 
 set(CMAKE_CXX_STANDARD 17)