CMake build: Remove usages of Qt5_VERSION

and remove checks for Qt < 6.2, since that is our minimum version. Except for sdktool and qml2puppet. Change-Id: Id36cd1a15a5a6e5480e4ae5d0a8ffaea4b2a1864 Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-01-23 11:44:31 +01:00
parent f37aa909ac
commit 06c4df37b9
12 changed files with 19 additions and 48 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -70,37 +70,23 @@ find_package(Qt5
  COMPONENTS Concurrent Core Gui Network PrintSupport Qml Sql Widgets Xml Core5Compat ${QT_TEST_COMPONENT}
  REQUIRED
 )
-if (Qt5_VERSION VERSION_LESS 6.0.0)
-  install(TARGETS Qt6Core5Compat EXPORT QtCreator)

-  # Specify standards conformance mode to MSVC 2017 and later
-  # Qt6 has the values as part of the Qt6::Platform target interface
-  if (MSVC AND MSVC_VERSION GREATER_EQUAL 1910)
-    add_compile_options(/permissive- /Zc:__cplusplus)
-  endif()
-  if (CMAKE_CXX_COMPILER_ID STREQUAL GNU)
-    add_compile_options(-Wno-missing-field-initializers)
-  endif()
-else()
-  # Common intermediate directory for QML modules which are defined via qt_add_qml_module()
-  set(QT_QML_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/qml_modules")
+# Common intermediate directory for QML modules which are defined via qt_add_qml_module()
+set(QT_QML_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/qml_modules")

-  # This includes the code that will enable higher compiler warnings level (/W3 for MSVC, -Wall -Wextra for GCC)
-  # This is controlled by QT_COMPILE_OPTIONS_DISABLE_WARNINGS target property.
-  include(QtCompilerFlags)
+# This includes the code that will enable higher compiler warnings level (/W3 for MSVC, -Wall -Wextra for GCC)
+# This is controlled by QT_COMPILE_OPTIONS_DISABLE_WARNINGS target property.
+include(QtCompilerFlags)

-  if (MSVC AND QT_FEATURE_static_runtime)
+if (MSVC AND QT_FEATURE_static_runtime)
  set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
-  endif()
 endif()
+
 find_package(Qt5 COMPONENTS LinguistTools QUIET)
 find_package(Qt5 COMPONENTS Quick QuickWidgets Designer DesignerComponents Help SerialPort Svg Tools QUIET)

 find_package(Threads)
 find_package(Clang QUIET)
-if (Qt5_VERSION VERSION_LESS 6.0.0)
-  find_package(KF5SyntaxHighlighting QUIET)
-endif()

 # Crashpad
 set(CRASHPAD_BACKEND_URL "" CACHE STRING "Crashpad backend URL")
--- a/cmake/QtCreatorAPI.cmake
+++ b/cmake/QtCreatorAPI.cmake
@@ -304,7 +304,8 @@ function(add_qtc_library name)
  endif()

  get_target_property(have_automoc_prop ${name} AUTOMOC)
-  if("${Qt5_VERSION}" VERSION_GREATER_EQUAL "6.2.0" AND "${have_automoc_prop}")
+  # check for Qt 6 is needed because sdktool & qml2puppet still build with Qt 5
+  if(Qt6_VERSION AND "${have_automoc_prop}")
    qt_extract_metatypes(${name})
  endif()
 endfunction(add_qtc_library)
--- a/src/app/CMakeLists.txt
+++ b/src/app/CMakeLists.txt
@@ -66,7 +66,7 @@ if (QTC_STATIC_BUILD)
    SOURCES "${CMAKE_CURRENT_BINARY_DIR}/plugin_imports.cpp"
  )

-  if (Qt5_VERSION VERSION_GREATER_EQUAL 6.0.0 AND TARGET QmlDesigner)
+  if (TARGET QmlDesigner)
    qt6_import_qml_plugins(qtcreator
      PATH_TO_SCAN "${CMAKE_CURRENT_SOURCE_DIR}/../../share/qtcreator/qmldesigner")
  endif()
--- a/src/libs/CMakeLists.txt
+++ b/src/libs/CMakeLists.txt
@@ -34,7 +34,7 @@ if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/qlitehtml/src/CMakeLists.txt)
      set(QLITEHTML_BIN_PATH ${IDE_BIN_PATH})
      set(QLITEHTML_LIBRARY_PATH ${IDE_LIBRARY_PATH})
    endif()
-    set(QT_VERSION_MAJOR ${Qt5_VERSION_MAJOR})
+    set(QT_VERSION_MAJOR ${Qt6_VERSION_MAJOR})
    option(BUILD_TESTING "Build litehtml tests" OFF) # otherwise litehtml downloads googletest
    add_subdirectory(qlitehtml/src)
  endif()
--- a/src/libs/sqlite/CMakeLists.txt
+++ b/src/libs/sqlite/CMakeLists.txt
@@ -1,6 +1,5 @@
 add_qtc_library(SqliteC OBJECT
    PROPERTIES AUTOMOC OFF AUTOUIC OFF QT_COMPILE_OPTIONS_DISABLE_WARNINGS ON POSITION_INDEPENDENT_CODE ON
-    CONDITION Qt5_VERSION VERSION_GREATER_EQUAL 6.2.0
    DEFINES SQLITE_CORE SQLITE_CUSTOM_INCLUDE=config.h $<$<CONFIG:Debug>:SQLITE_DEBUG>
    PROPERTIES COMPILE_OPTIONS $<IF:$<CXX_COMPILER_ID:MSVC>,/FIconfig.h,-includeconfig.h>
    PUBLIC_INCLUDES
@@ -18,7 +17,6 @@ add_qtc_library(SqliteC OBJECT
 add_qtc_library(Sqlite
  PROPERTIES AUTOMOC OFF AUTOUIC OFF
  DEPENDS Qt::Core Threads::Threads ${CMAKE_DL_LIBS} SqliteC
-  CONDITION Qt5_VERSION VERSION_GREATER_EQUAL 6.2.0
  PUBLIC_INCLUDES
    "${CMAKE_CURRENT_LIST_DIR}"
  DEFINES SQLITE_CUSTOM_INCLUDE=config.h $<$<CONFIG:Debug>:SQLITE_REVERSE>
--- a/src/plugins/coreplugin/CMakeLists.txt
+++ b/src/plugins/coreplugin/CMakeLists.txt
@@ -207,15 +207,9 @@ if ((NOT WIN32) AND (NOT APPLE))
 endif()

 set(FONTS_BASE "${QtCreator_SOURCE_DIR}/src/share/3rdparty/studiofonts/")
-if(${Qt5_VERSION} VERSION_LESS "6")
-extend_qtc_plugin(Core
-  SOURCES "${FONTS_BASE}/studiofonts.qrc"
-)
-else() # < Qt 6
 qt_add_resources(Core
  CoreWelcomeScreenFonts_rcc
  BASE ${FONTS_BASE}
  PREFIX "studiofonts"
  FILES "${FONTS_BASE}/TitilliumWeb-Regular.ttf"
 )
-endif()
--- a/src/plugins/qmldesigner/CMakeLists.txt
+++ b/src/plugins/qmldesigner/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_qtc_plugin(QmlDesigner
-  CONDITION Qt5_VERSION VERSION_GREATER_EQUAL 6.2.0 AND TARGET Qt::QuickWidgets AND TARGET Qt::Svg
+  CONDITION TARGET Qt::QuickWidgets AND TARGET Qt::Svg
  DEPENDS
    QmlJS LanguageUtils QmlEditorWidgets AdvancedDockingSystem
    Qt::QuickWidgets Qt::CorePrivate Sqlite Qt::Xml Qt::Svg
@@ -498,7 +498,7 @@ function(get_and_add_as_subdirectory name repository git_tag build_dir source_di
 endfunction()

 if (WITH_QMLDOM)
-  if (Qt5_VERSION VERSION_LESS 6.3.2)
+  if (Qt6_VERSION VERSION_LESS 6.3.2)
    message(FATAL_ERROR "You need Qt 6.3.2 or newer to enable WITH_QMLDOM feature.")
  endif()

--- a/src/plugins/qmlpreview/CMakeLists.txt
+++ b/src/plugins/qmlpreview/CMakeLists.txt
@@ -23,13 +23,9 @@ extend_qtc_plugin(QmlPreview
    tests/qmlpreviewplugin_test.cpp tests/qmlpreviewplugin_test.h
 )

-if(TARGET Qt${QT_VERSION_MAJOR}::QmlPrivate)
-  # check if Qt version have_qml_debug_translation_protocol
-  # will be introduced in Qt 6.2, but there are users
-  # who needs it in older but special built Qt versions aswell
-  string(REGEX MATCH "^[0-9]*" QT_VERSION_MAJOR ${Qt5_VERSION})
+if(TARGET Qt6::QmlPrivate)
  get_target_property(qmldebugprivate_include_directories
-                      Qt${QT_VERSION_MAJOR}::QmlPrivate
+                      Qt6::QmlPrivate
                      INTERFACE_INCLUDE_DIRECTORIES
  )
  find_file(have_qml_debug_translation_protocol
--- a/tests/auto/qml/qmldesigner/CMakeLists.txt
+++ b/tests/auto/qml/qmldesigner/CMakeLists.txt
@@ -1,4 +1,2 @@
-if (${Qt5_VERSION} VERSION_GREATER_EQUAL "6.2.0")
-  add_subdirectory(coretests)
-  add_subdirectory(wizard)
-endif()
+add_subdirectory(coretests)
+add_subdirectory(wizard)
--- a/tests/auto/qml/qmldesigner/coretests/CMakeLists.txt
+++ b/tests/auto/qml/qmldesigner/coretests/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_qtc_test(tst_qml_testcore
  EXCLUDE_FROM_PRECHECK
-  CONDITION TARGET QmlProjectManager AND Qt5_VERSION VERSION_GREATER_EQUAL 6.2.0
+  CONDITION TARGET QmlProjectManager
  DEPENDS
    Sqlite
    QmlDesignerCore
--- a/tests/auto/utils/qtcprocess/CMakeLists.txt
+++ b/tests/auto/utils/qtcprocess/CMakeLists.txt
@@ -4,7 +4,6 @@ file(RELATIVE_PATH RELATIVE_TEST_PATH "${PROJECT_BINARY_DIR}" "${CMAKE_CURRENT_B
 file(RELATIVE_PATH TEST_RELATIVE_LIBEXEC_PATH "/${RELATIVE_TEST_PATH}" "/${IDE_LIBEXEC_PATH}")

 add_qtc_test(tst_qtcprocess
-  CONDITION Qt5_VERSION VERSION_GREATER_EQUAL 6.2.0
  DEFINES "TEST_RELATIVE_LIBEXEC_PATH=\"${TEST_RELATIVE_LIBEXEC_PATH}\""
          "PROCESS_TESTAPP=\"${CMAKE_CURRENT_BINARY_DIR}/processtestapp\""
  DEPENDS Utils app_version
--- a/tests/unit/unittest/CMakeLists.txt
+++ b/tests/unit/unittest/CMakeLists.txt
@@ -26,7 +26,6 @@ add_qtc_test(unittest GTEST
    Qt::Xml Qt::Concurrent Qt::Qml Qt::Gui
    Qt6Core5Compat QmlJS Sqlite SqliteC
    Googletest
-  CONDITION Qt5_VERSION VERSION_GREATER_EQUAL 6.2.0
  DEFINES
    QT_NO_CAST_TO_ASCII
    QT_RESTRICTED_CAST_FROM_ASCII