CMake build: Use version-less Qt targets

Since we do not support Qt < 5.15 anymore, and as a first step
for getting rid of our special FindQt5.cmake.

Change-Id: Icc5dbaf9b0a3a622b1f609ff114b9decb6d2856c
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>

5 files changed, 20 insertions, 19 deletions

diff --git a/cmake/QtCreatorAPI.cmake b/cmake/QtCreatorAPI.cmake
index 68461f8bcd..87edde968c 100644
--- a/cmake/QtCreatorAPI.cmake
+++ b/cmake/QtCreatorAPI.cmake
@@ -1054,11 +1054,11 @@ function(qtc_add_resources target resourceName)
 
   # Process .qrc file:
   add_custom_command(OUTPUT "${generatedSourceCode}"
-                     COMMAND Qt5::rcc ${rccArgs}
+                     COMMAND Qt::rcc ${rccArgs}
                      DEPENDS
                       ${resource_dependencies}
                       ${generatedResourceFile}
-                      "Qt5::rcc"
+                      "Qt::rcc"
                      COMMENT "RCC ${newResourceName}"
                      VERBATIM)
 
diff --git a/cmake/QtCreatorAPIInternal.cmake b/cmake/QtCreatorAPIInternal.cmake
index ace1f3c8d1..efe7efd9ce 100644
--- a/cmake/QtCreatorAPIInternal.cmake
+++ b/cmake/QtCreatorAPIInternal.cmake
@@ -277,7 +277,8 @@ function(finalize_test_setup test_name)
     list(APPEND env_path $ENV{PATH})
     list(APPEND env_path ${CMAKE_BINARY_DIR}/${_IDE_PLUGIN_PATH})
     list(APPEND env_path ${CMAKE_BINARY_DIR}/${_IDE_BIN_PATH})
-    list(APPEND env_path $<TARGET_FILE_DIR:Qt5::Test>)
+    # version-less target Qt::Test is an interface library that links to QtX::Test
+    list(APPEND env_path $<TARGET_FILE_DIR:$<TARGET_PROPERTY:Qt::Test,INTERFACE_LINK_LIBRARIES>>)
     if (TARGET libclang)
         list(APPEND env_path $<TARGET_FILE_DIR:libclang>)
     endif()
@@ -430,15 +431,15 @@ function(enable_pch target)
             PROPERTIES GENERATED TRUE)
 
         _add_pch_target(${PROJECT_NAME}PchGui
-          "${QtCreator_SOURCE_DIR}/src/shared/qtcreator_gui_pch.h" Qt5::Widgets)
+          "${QtCreator_SOURCE_DIR}/src/shared/qtcreator_gui_pch.h" Qt::Widgets)
         _add_pch_target(${PROJECT_NAME}PchConsole
-          "${QtCreator_SOURCE_DIR}/src/shared/qtcreator_pch.h" Qt5::Core)
+          "${QtCreator_SOURCE_DIR}/src/shared/qtcreator_pch.h" Qt::Core)
       endif()
 
       unset(PCH_TARGET)
-      if ("Qt5::Widgets" IN_LIST dependencies)
+      if ("Qt::Widgets" IN_LIST dependencies)
         set(PCH_TARGET ${PROJECT_NAME}PchGui)
-      elseif ("Qt5::Core" IN_LIST dependencies)
+      elseif ("Qt::Core" IN_LIST dependencies)
         set(PCH_TARGET ${PROJECT_NAME}PchConsole)
       endif()
 
diff --git a/cmake/QtCreatorDocumentation.cmake b/cmake/QtCreatorDocumentation.cmake
index a652d62517..0dbd46f47a 100644
--- a/cmake/QtCreatorDocumentation.cmake
+++ b/cmake/QtCreatorDocumentation.cmake
@@ -9,7 +9,7 @@ add_feature_info("Build online documentation" WITH_ONLINE_DOCS "")
 # as this is not yet exported by cmake.
 # Used for QT_INSTALL_DOCS
 function(qt5_query_qmake)
-  if (NOT TARGET Qt5::qmake)
+  if (NOT TARGET Qt::qmake)
     message(FATAL_ERROR "Qmake was not found. Add find_package(Qt5 COMPONENTS Core) to CMake to enable.")
   endif()
   # dummy check for if we already queried qmake
@@ -17,7 +17,7 @@ function(qt5_query_qmake)
     return()
   endif()
 
-  get_target_property(_qmake_binary Qt5::qmake IMPORTED_LOCATION)
+  get_target_property(_qmake_binary Qt::qmake IMPORTED_LOCATION)
   execute_process(COMMAND "${_qmake_binary}" "-query"
                   TIMEOUT 10
                   RESULT_VARIABLE _qmake_result
@@ -45,11 +45,11 @@ endfunction()
 
 # Find programs:
 function(_doc_find_program result_var)
-  if (NOT TARGET Qt5::qmake)
+  if (NOT TARGET Qt::qmake)
     message(FATAL_ERROR "QDoc is only available in Qt5 projects")
   endif()
 
-  get_target_property(_qmake_binary Qt5::qmake IMPORTED_LOCATION)
+  get_target_property(_qmake_binary Qt::qmake IMPORTED_LOCATION)
   get_filename_component(_qmake_dir "${_qmake_binary}" DIRECTORY)
   find_program("_prg_${result_var}" ${ARGN} HINTS "${_qmake_dir}")
   if ("_prg_${result_var}" STREQUAL "_prg_${result_var}-NOTFOUND")
@@ -153,7 +153,7 @@ function(_setup_qhelpgenerator_targets _qdocconf_file _html_outputdir)
     set(_arg_QCH_DIR "${CMAKE_CURRENT_BINARY_DIR}/doc")
   endif()
 
-  if (NOT TARGET Qt5::qhelpgenerator)
+  if (NOT TARGET Qt::qhelpgenerator)
     message(WARNING "qhelpgenerator missing: No QCH documentation targets were generated. Add find_package(Qt5 COMPONENTS Help) to CMake to enable.")
     return()
   endif()
@@ -166,7 +166,7 @@ function(_setup_qhelpgenerator_targets _qdocconf_file _html_outputdir)
   set(_qch_target "qch_docs_${_target}")
   set(_html_target "html_docs_${_target}")
   add_custom_target("${_qch_target}"
-    Qt5::qhelpgenerator "${_html_outputdir}/${_target}.qhp" -o "${_qch_outputdir}/${_target}.qch"
+    Qt::qhelpgenerator "${_html_outputdir}/${_target}.qhp" -o "${_qch_outputdir}/${_target}.qch"
     COMMENT "Build QCH documentation from ${_qdocconf_file}"
     WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
     VERBATIM
diff --git a/cmake/QtCreatorTranslations.cmake b/cmake/QtCreatorTranslations.cmake
index 2fb3f79982..3c35f2f912 100644
--- a/cmake/QtCreatorTranslations.cmake
+++ b/cmake/QtCreatorTranslations.cmake
@@ -91,7 +91,7 @@ function(_create_ts_custom_target name)
   file(WRITE "${ts_file_list}" "${_sources_str}\n${_includes_str}\n")
 
   add_custom_target("${_arg_TS_TARGET_PREFIX}${name}"
-    COMMAND Qt5::lupdate -locations relative -no-ui-lines -no-sort "@${ts_file_list}" -ts ${ts_files}
+    COMMAND Qt::lupdate -locations relative -no-ui-lines -no-sort "@${ts_file_list}" -ts ${ts_files}
     WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
     COMMENT "Generate .ts files"
     DEPENDS ${_sources}
@@ -103,11 +103,11 @@ function(_create_ts_custom_target name)
   list(LENGTH ts_files file_count)
   if(file_count EQUAL 1)
     # get path for lconvert...
-    get_target_property(_lupdate_binary Qt5::lupdate IMPORTED_LOCATION)
+    get_target_property(_lupdate_binary Qt::lupdate IMPORTED_LOCATION)
     get_filename_component(_bin_dir ${_lupdate_binary} DIRECTORY)
 
     add_custom_target("${_arg_TS_TARGET_PREFIX}${name}_cleaned"
-      COMMAND Qt5::lupdate -locations relative -no-ui-lines -no-sort "@${ts_file_list}" -ts ${ts_files}
+      COMMAND Qt::lupdate -locations relative -no-ui-lines -no-sort "@${ts_file_list}" -ts ${ts_files}
       COMMAND ${_bin_dir}/lconvert -locations none -no-ui-lines -no-obsolete ${ts_files} -o ${ts_files}
       WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
       COMMENT "Generate .ts files, remove obsolete and vanished translations, and do not add files and line number"
@@ -117,7 +117,7 @@ function(_create_ts_custom_target name)
 endfunction()
 
 function(add_translation_targets file_prefix)
-  if (NOT TARGET Qt5::lrelease OR NOT TARGET Qt5::lupdate)
+  if (NOT TARGET Qt::lrelease OR NOT TARGET Qt::lupdate)
     # No Qt translation tools were found: Skip this directory
     message(WARNING "No Qt translation tools found, skipping translation targets. Add find_package(Qt5 COMPONENTS LinguistTools) to CMake to enable.")
     return()
@@ -170,7 +170,7 @@ function(add_translation_targets file_prefix)
       SOURCES ${_to_process_sources} ${_arg_SOURCES} INCLUDES ${_to_process_includes} ${_arg_INCLUDES})
 
     add_custom_command(OUTPUT "${_qm_file}"
-      COMMAND Qt5::lrelease "${_ts_file}" -qm "${_qm_file}"
+      COMMAND Qt::lrelease "${_ts_file}" -qm "${_qm_file}"
       MAIN_DEPENDENCY "${_ts_file}"
       WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
       COMMENT "Generate .qm file"
diff --git a/cmake/Utils.cmake b/cmake/Utils.cmake
index 602781ca39..d684b97264 100644
--- a/cmake/Utils.cmake
+++ b/cmake/Utils.cmake
@@ -11,7 +11,7 @@ function(setup_dependencies_component)
   if (NOT Python3_Interpreter_FOUND)
     message("No python interpreter found, skipping \"Dependencies\" install component.")
   else()
-    get_target_property(_qmake_binary Qt5::qmake IMPORTED_LOCATION)
+    get_target_property(_qmake_binary Qt::qmake IMPORTED_LOCATION)
     set(_llvm_arg)
     if (LLVM_INSTALL_PREFIX)
       set(_llvm_arg "--llvm \"${LLVM_INSTALL_PREFIX}\"")