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>
2022-12-20 17:31:22 +01:00
parent 894685d501
commit 55fa109b59
105 changed files with 184 additions and 181 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -54,7 +54,7 @@ set(CMAKE_AUTOUIC ON)

 if (WITH_TESTS)
  set(QT_TEST_COMPONENT Test)
-  set(IMPLICIT_DEPENDS Qt5::Test)
+  set(IMPLICIT_DEPENDS Qt::Test)
 endif()

 # suppress bogus warning
@@ -124,12 +124,12 @@ function (set_if_target var target)
   set(${var} "${_result}" PARENT_SCOPE)
 endfunction()

-set_if_target(_has_svg_target Qt5::Svg)
+set_if_target(_has_svg_target Qt::Svg)
 option(ENABLE_SVG_SUPPORT "Enable SVG support" "${_has_svg_target}")

 add_library(OptionalSvg INTERFACE)
-if (TARGET Qt5::Svg AND ENABLE_SVG_SUPPORT)
-  target_link_libraries(OptionalSvg INTERFACE Qt5::Svg)
+if (TARGET Qt::Svg AND ENABLE_SVG_SUPPORT)
+  target_link_libraries(OptionalSvg INTERFACE Qt::Svg)
 else()
  target_compile_definitions(OptionalSvg INTERFACE QT_NO_SVG)
 endif()
--- 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)

--- 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()

--- 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
--- 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"
--- 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}\"")
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -25,7 +25,9 @@ function(_find_all_includes _ret_includes _ret_framework_paths)

  # framework path
  if (APPLE)
-    get_target_property(_qt_target Qt5::Core LOCATION) # <fw_path>/QtCore.framework/QtCore
+    # version-less target Qt::Core is an interface library that links to QtX::Core
+    get_target_property(_qt_core Qt::Core INTERFACE_LINK_LIBRARIES)
+    get_target_property(_qt_target ${_qt_core} LOCATION) # <fw_path>/QtCore.framework/QtCore
    get_filename_component(_qt_loc "${_qt_target}" DIRECTORY)
    set("${_ret_framework_paths}" "${_qt_loc}/.." PARENT_SCOPE)
  endif()
--- a/src/app/CMakeLists.txt
+++ b/src/app/CMakeLists.txt
@@ -12,7 +12,7 @@ install(

 add_qtc_executable(qtcreator
  DEFINES IDE_LIBRARY_BASENAME=\"${IDE_LIBRARY_BASE_PATH}\"
-  DEPENDS Aggregation ExtensionSystem Qt5::Core Qt5::Widgets Utils shared_qtsingleapplication app_version
+  DEPENDS Aggregation ExtensionSystem Qt::Core Qt::Widgets Utils shared_qtsingleapplication app_version
  SOURCES
    main.cpp
    ../tools/qtcreatorcrashhandler/crashhandlersetup.cpp ../tools/qtcreatorcrashhandler/crashhandlersetup.h
--- a/src/libs/3rdparty/cplusplus/CMakeLists.txt
+++ b/src/libs/3rdparty/cplusplus/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_qtc_library(3rd_cplusplus OBJECT
-  PUBLIC_DEPENDS Qt5::Core Utils
+  PUBLIC_DEPENDS Qt::Core Utils
  SOURCES
    AST.cpp AST.h
    ASTClone.cpp
--- a/src/libs/3rdparty/syntax-highlighting/CMakeLists.txt
+++ b/src/libs/3rdparty/syntax-highlighting/CMakeLists.txt
@@ -11,7 +11,7 @@ add_qtc_library(KSyntaxHighlighting
    src/lib
    autogenerated/include
    autogenerated/src/lib
-  DEPENDS Qt5::Network Qt5::Widgets
+  DEPENDS Qt::Network Qt::Widgets
  SOURCES
    autogenerated/src/lib/ksyntaxhighlighting_logging.cpp autogenerated/src/lib/ksyntaxhighlighting_logging.h
    autogenerated/ksyntaxhighlighting_version.h
--- a/src/libs/3rdparty/syntax-highlighting/src/indexer/CMakeLists.txt
+++ b/src/libs/3rdparty/syntax-highlighting/src/indexer/CMakeLists.txt
@@ -32,7 +32,7 @@ else()
    add_executable(katehighlightingindexer katehighlightingindexer.cpp ../lib/worddelimiters.cpp)
    ecm_mark_nongui_executable(katehighlightingindexer)
    if(Qt5XmlPatterns_FOUND AND NOT ECM_ENABLE_SANITIZERS)
-        target_link_libraries(katehighlightingindexer Qt5::XmlPatterns)
+        target_link_libraries(katehighlightingindexer Qt::XmlPatterns)
    else()
        target_link_libraries(katehighlightingindexer Qt${QT_MAJOR_VERSION}::Core)
    endif()
--- a/src/libs/advanceddockingsystem/CMakeLists.txt
+++ b/src/libs/advanceddockingsystem/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_qtc_library(AdvancedDockingSystem
-  DEPENDS Qt5::Widgets Qt5::Core Qt5::Gui Utils
+  DEPENDS Qt::Widgets Qt::Core Qt::Gui Utils
  SOURCES
    ads_globals.cpp ads_globals.h
    advanceddockingsystemtr.h
--- a/src/libs/aggregation/CMakeLists.txt
+++ b/src/libs/aggregation/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_qtc_library(Aggregation
-  DEPENDS Qt5::Core
+  DEPENDS Qt::Core
  SOURCES
    aggregate.cpp aggregate.h
    aggregation_global.h
--- a/src/libs/cplusplus/CMakeLists.txt
+++ b/src/libs/cplusplus/CMakeLists.txt
@@ -1,8 +1,8 @@
-# TODO: Make Qt5::Gui optional -- if really needed that is.
+# TODO: Make Qt::Gui optional -- if really needed that is.

 add_qtc_library(CPlusPlus
-  DEPENDS Utils Qt5::Concurrent
-  PUBLIC_DEPENDS 3rd_cplusplus Qt5::Gui
+  DEPENDS Utils Qt::Concurrent
+  PUBLIC_DEPENDS 3rd_cplusplus Qt::Gui
  SOURCES
    ASTParent.cpp ASTParent.h
    ASTPath.cpp ASTPath.h
--- a/src/libs/extensionsystem/CMakeLists.txt
+++ b/src/libs/extensionsystem/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_qtc_library(ExtensionSystem
  DEPENDS Aggregation Utils
-  PUBLIC_DEPENDS Qt5::Core Qt5::Widgets
+  PUBLIC_DEPENDS Qt::Core Qt::Widgets
  SOURCES
    extensionsystem_global.h
    extensionsystemtr.h
@@ -22,7 +22,7 @@ add_qtc_library(ExtensionSystem
 find_package(Qt5 COMPONENTS Test QUIET)

 extend_qtc_library(ExtensionSystem
-  CONDITION TARGET Qt5::Test
-  DEPENDS Qt5::Test
+  CONDITION TARGET Qt::Test
+  DEPENDS Qt::Test
  DEFINES WITH_TESTS
 )
--- a/src/libs/glsl/CMakeLists.txt
+++ b/src/libs/glsl/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_qtc_library(GLSL
-  DEPENDS Qt5::Core
+  DEPENDS Qt::Core
  SOURCES
    glsl.h
    glslast.cpp glslast.h
--- a/src/libs/languageutils/CMakeLists.txt
+++ b/src/libs/languageutils/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_qtc_library(LanguageUtils
-  PUBLIC_DEPENDS Qt5::Core
+  PUBLIC_DEPENDS Qt::Core
  SOURCES
    componentversion.cpp componentversion.h
    fakemetaobject.cpp fakemetaobject.h
--- a/src/libs/modelinglib/CMakeLists.txt
+++ b/src/libs/modelinglib/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_qtc_library(Modeling
-  DEPENDS Qt5::Widgets Utils
+  DEPENDS Qt::Widgets Utils
  PUBLIC_DEPENDS OptionalSvg
  INCLUDES qtserialization/inc
  PUBLIC_INCLUDES
--- a/src/libs/nanotrace/CMakeLists.txt
+++ b/src/libs/nanotrace/CMakeLists.txt
@@ -3,7 +3,7 @@ add_qtc_library(Nanotrace
  DEFINES NANOTRACE_LIBRARY
  PUBLIC_DEFINES NANOTRACE_ENABLED
  SOURCES nanotrace.cpp nanotrace.h
-  PUBLIC_DEPENDS Qt5::Core
+  PUBLIC_DEPENDS Qt::Core
  PROPERTIES
    CXX_VISIBILITY_PRESET default
    VISIBILITY_INLINES_HIDDEN OFF
--- a/src/libs/qmldebug/CMakeLists.txt
+++ b/src/libs/qmldebug/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_qtc_library(QmlDebug
-  DEPENDS Qt5::Network Utils
+  DEPENDS Qt::Network Utils
  SOURCES
    baseenginedebugclient.cpp baseenginedebugclient.h
    basetoolsclient.cpp basetoolsclient.h
--- a/src/libs/qmleditorwidgets/CMakeLists.txt
+++ b/src/libs/qmleditorwidgets/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_qtc_library(QmlEditorWidgets
-  DEPENDS QmlJS Utils Qt5::Widgets
+  DEPENDS QmlJS Utils Qt::Widgets
  SOURCES
    colorbox.cpp colorbox.h
    colorbutton.cpp colorbutton.h
--- a/src/libs/qmljs/CMakeLists.txt
+++ b/src/libs/qmljs/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_qtc_library(QmlJS
-  DEPENDS ExtensionSystem Utils Qt5::Xml
-  PUBLIC_DEPENDS CPlusPlus Qt5::Widgets LanguageUtils
+  DEPENDS ExtensionSystem Utils Qt::Xml
+  PUBLIC_DEPENDS CPlusPlus Qt::Widgets LanguageUtils
  SOURCES
    jsoncheck.cpp jsoncheck.h
    parser/qmldirparser.cpp parser/qmldirparser_p.h
--- a/src/libs/qmlpuppetcommunication/QmlPuppetCommunication.cmake
+++ b/src/libs/qmlpuppetcommunication/QmlPuppetCommunication.cmake
@@ -1,6 +1,6 @@
 add_qtc_library(QmlPuppetCommunication STATIC
    PROPERTIES AUTOUIC OFF
-    DEPENDS Qt5::Core Qt5::CorePrivate Qt5::Gui
+    DEPENDS Qt::Core Qt::CorePrivate Qt::Gui
 )

 extend_qtc_library(QmlPuppetCommunication
--- a/src/libs/sqlite/CMakeLists.txt
+++ b/src/libs/sqlite/CMakeLists.txt
@@ -14,7 +14,7 @@ add_qtc_library(SqliteC OBJECT

 add_qtc_library(Sqlite
  PROPERTIES AUTOMOC OFF AUTOUIC OFF
-  DEPENDS Qt5::Core Threads::Threads ${CMAKE_DL_LIBS} SqliteC
+  DEPENDS Qt::Core Threads::Threads ${CMAKE_DL_LIBS} SqliteC
  CONDITION Qt5_VERSION VERSION_GREATER_EQUAL 6.2.0
  PUBLIC_INCLUDES
    "${CMAKE_CURRENT_LIST_DIR}"
--- a/src/libs/tracing/CMakeLists.txt
+++ b/src/libs/tracing/CMakeLists.txt
@@ -36,10 +36,10 @@ set(TRACING_CPP_SOURCES
 find_package(Qt6 COMPONENTS ShaderTools QUIET)

 add_qtc_library(Tracing
-  CONDITION TARGET Qt6::ShaderTools AND TARGET Qt5::Quick
+  CONDITION TARGET Qt6::ShaderTools AND TARGET Qt::Quick
  FEATURE_INFO
-  DEPENDS Utils Qt5::Quick
-  PUBLIC_DEPENDS Qt5::Widgets Qt5::Qml
+  DEPENDS Utils Qt::Quick
+  PUBLIC_DEPENDS Qt::Widgets Qt::Qml
  SOURCES
    ${TEST_SOURCES}
 )
--- a/src/libs/utils/CMakeLists.txt
+++ b/src/libs/utils/CMakeLists.txt
@@ -1,7 +1,7 @@
 add_qtc_library(Utils
-  DEPENDS Qt5::Qml Qt5::Xml
+  DEPENDS Qt::Qml Qt::Xml
  PUBLIC_DEPENDS
-    Qt5::Concurrent Qt5::Core Qt5::Network Qt5::Gui Qt5::Widgets
+    Qt::Concurrent Qt::Core Qt::Network Qt::Gui Qt::Widgets
    Qt6Core5Compat
  SOURCES
    ../3rdparty/span/span.hpp
@@ -254,8 +254,8 @@ extend_qtc_library(Utils CONDITION UNIX AND NOT APPLE
 )

 extend_qtc_library(Utils
-  CONDITION TARGET Qt5::CorePrivate
-  DEPENDS Qt5::CorePrivate
+  CONDITION TARGET Qt::CorePrivate
+  DEPENDS Qt::CorePrivate
  DEFINES QTC_UTILS_WITH_FSENGINE
  SOURCES fsengine/fsengine_impl.cpp
          fsengine/fsengine_impl.h
--- a/src/plugins/android/CMakeLists.txt
+++ b/src/plugins/android/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_qtc_plugin(Android
-  DEPENDS QmlDebug Qt5::Xml LanguageServerProtocol
+  DEPENDS QmlDebug Qt::Xml LanguageServerProtocol
  PLUGIN_DEPENDS Core Debugger ProjectExplorer QtSupport LanguageClient
  SOURCES
    android.qrc
--- a/src/plugins/beautifier/CMakeLists.txt
+++ b/src/plugins/beautifier/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_qtc_plugin(Beautifier
-  DEPENDS Qt5::Xml
+  DEPENDS Qt::Xml
  PLUGIN_DEPENDS Core ProjectExplorer TextEditor
  SOURCES
    abstractsettings.cpp abstractsettings.h
--- a/src/plugins/boot2qt/CMakeLists.txt
+++ b/src/plugins/boot2qt/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_qtc_plugin(Boot2Qt
  PLUGIN_CLASS QdbPlugin
-  DEPENDS Qt5::Network
+  DEPENDS Qt::Network
  PLUGIN_DEPENDS Core Debugger ProjectExplorer QtSupport RemoteLinux
  SOURCES
    qdb.qrc
--- a/src/plugins/clangformat/CMakeLists.txt
+++ b/src/plugins/clangformat/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_qtc_plugin(ClangFormat
  CONDITION TARGET ${CLANG_FORMAT_LIB} AND LLVM_PACKAGE_VERSION VERSION_GREATER_EQUAL 10.0.0 AND (QTC_CLANG_BUILDMODE_MATCH OR CLANGTOOLING_LINK_CLANG_DYLIB)
-  DEPENDS Utils Qt5::Widgets ${CLANG_FORMAT_LIB}
+  DEPENDS Utils Qt::Widgets ${CLANG_FORMAT_LIB}
  PLUGIN_DEPENDS Core TextEditor CppEditor ProjectExplorer
  SOURCES
    clangformatbaseindenter.cpp clangformatbaseindenter.h
--- a/src/plugins/clangtools/unit-tests/exported-diagnostics/CMakeLists.txt
+++ b/src/plugins/clangtools/unit-tests/exported-diagnostics/CMakeLists.txt
@@ -20,4 +20,4 @@ add_executable(clangtools
  tidy.modernize-use-nullptr.cpp
 )

-target_link_libraries(clangtools PRIVATE Qt5::Widgets)
+target_link_libraries(clangtools PRIVATE Qt::Widgets)
--- a/src/plugins/coreplugin/CMakeLists.txt
+++ b/src/plugins/coreplugin/CMakeLists.txt
@@ -4,7 +4,7 @@ endif()
 configure_file(core_logo.qrc.cmakein core_logo_cmake.qrc)

 add_qtc_plugin(Core
-  DEPENDS Qt5::PrintSupport Qt5::Qml Qt5::Sql Qt5::Gui Qt5::GuiPrivate
+  DEPENDS Qt::PrintSupport Qt::Qml Qt::Sql Qt::Gui Qt::GuiPrivate
  PUBLIC_DEPENDS Aggregation ExtensionSystem Utils app_version
  SOURCES
    actionmanager/actioncontainer.cpp actionmanager/actioncontainer.h actionmanager/actioncontainer_p.h
--- a/src/plugins/cpaster/CMakeLists.txt
+++ b/src/plugins/cpaster/CMakeLists.txt
@@ -3,7 +3,7 @@ add_subdirectory(frontend)
 add_qtc_plugin(CodePaster
  PLUGIN_DEPENDS Core TextEditor
  DEFINES CPASTER_PLUGIN_GUI
-  DEPENDS Qt5::Network
+  DEPENDS Qt::Network
  INCLUDES ../../shared/cpaster
  SOURCES
    codepasterservice.h
--- a/src/plugins/cpaster/frontend/CMakeLists.txt
+++ b/src/plugins/cpaster/frontend/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_qtc_executable(cpaster
-  DEPENDS Core Utils Qt5::Network
+  DEPENDS Core Utils Qt::Network
  SOURCES
    argumentscollector.cpp argumentscollector.h
    main.cpp
--- a/src/plugins/cppcheck/CMakeLists.txt
+++ b/src/plugins/cppcheck/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_qtc_plugin(Cppcheck
-  DEPENDS Qt5::Widgets
+  DEPENDS Qt::Widgets
  PLUGIN_DEPENDS Core Debugger CppEditor ProjectExplorer TextEditor
  SOURCES
    cppcheckconstants.h
--- a/src/plugins/cppeditor/CMakeLists.txt
+++ b/src/plugins/cppeditor/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_qtc_plugin(CppEditor
-  DEPENDS Qt5::Network Qt5::Xml
-  PUBLIC_DEPENDS CPlusPlus Qt5::Widgets
+  DEPENDS Qt::Network Qt::Xml
+  PUBLIC_DEPENDS CPlusPlus Qt::Widgets
  PLUGIN_DEPENDS Core ProjectExplorer TextEditor
  PLUGIN_TEST_DEPENDS QbsProjectManager QmakeProjectManager
  SOURCES
--- a/src/plugins/ctfvisualizer/CMakeLists.txt
+++ b/src/plugins/ctfvisualizer/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_qtc_plugin(CtfVisualizer
  CONDITION TARGET Tracing
-  DEPENDS Tracing Qt5::QuickWidgets
+  DEPENDS Tracing Qt::QuickWidgets
  INCLUDES ${PROJECT_SOURCE_DIR}/src
  PLUGIN_DEPENDS Core Debugger ProjectExplorer
  SOURCES
--- a/src/plugins/designer/CMakeLists.txt
+++ b/src/plugins/designer/CMakeLists.txt
@@ -1,8 +1,8 @@
 add_qtc_plugin(Designer
  PLUGIN_CLASS FormEditorPlugin
-  CONDITION TARGET Qt5::DesignerComponents AND TARGET Qt5::Designer
+  CONDITION TARGET Qt::DesignerComponents AND TARGET Qt::Designer
  DEPENDS designerintegrationv2
-    Qt5::Designer Qt5::PrintSupport Qt5::DesignerComponents
+    Qt::Designer Qt::PrintSupport Qt::DesignerComponents
  DEFINES CPP_ENABLED
  PLUGIN_DEPENDS Core CppEditor ProjectExplorer QtSupport ResourceEditor TextEditor
  PLUGIN_TEST_DEPENDS CppEditor
@@ -33,12 +33,14 @@ add_qtc_plugin(Designer
 )

 extend_qtc_plugin(Designer
-  CONDITION WITH_TESTS AND TARGET Qt5::DesignerComponents AND TARGET Qt5::Designer
+  CONDITION WITH_TESTS AND TARGET Qt::DesignerComponents AND TARGET Qt::Designer
  SOURCES gotoslot_test.cpp
 )

 if (QTC_STATIC_BUILD AND TARGET Designer)
-  get_target_property(_designerType Qt5::Designer TYPE)
+  # version-less target Qt::Designer is an interface library that links to QtX::Designer
+  get_target_property(_designer Qt::Designer INTERFACE_LINK_LIBRARIES)
+  get_target_property(_designerType ${_designer} TYPE)
  if (${_designerType} STREQUAL "STATIC_LIBRARY")
    extend_qtc_target(Designer PUBLIC_DEFINES QT_DESIGNER_STATIC)
  endif()
--- a/src/plugins/help/CMakeLists.txt
+++ b/src/plugins/help/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_qtc_plugin(Help
-  CONDITION TARGET Qt5::Help
+  CONDITION TARGET Qt::Help
  DEPENDS shared_help
  PLUGIN_DEPENDS Core ProjectExplorer
  PLUGIN_RECOMMENDS TextEditor
@@ -48,9 +48,9 @@ extend_qtc_plugin(Help
 option(BUILD_HELPVIEWERBACKEND_QTWEBENGINE "Build QtWebEngine based help viewer backend." YES)
 find_package(Qt5 COMPONENTS WebEngineWidgets QUIET)
 extend_qtc_plugin(Help
-  CONDITION BUILD_HELPVIEWERBACKEND_QTWEBENGINE AND TARGET Qt5::WebEngineWidgets
+  CONDITION BUILD_HELPVIEWERBACKEND_QTWEBENGINE AND TARGET Qt::WebEngineWidgets
  FEATURE_INFO "QtWebEngine help viewer"
-  DEPENDS Qt5::WebEngineWidgets
+  DEPENDS Qt::WebEngineWidgets
  DEFINES QTC_WEBENGINE_HELPVIEWER
  SOURCES
    webenginehelpviewer.cpp
--- a/src/plugins/imageviewer/CMakeLists.txt
+++ b/src/plugins/imageviewer/CMakeLists.txt
@@ -1,6 +1,6 @@
 find_package(Qt5 COMPONENTS SvgWidgets QUIET)
-if (TARGET Qt5::SvgWidgets)
-  set(SVG_WIDGETS Qt5::SvgWidgets)
+if (TARGET Qt::SvgWidgets)
+  set(SVG_WIDGETS Qt::SvgWidgets)
 endif()

 add_qtc_plugin(ImageViewer
--- a/src/plugins/ios/CMakeLists.txt
+++ b/src/plugins/ios/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_qtc_plugin(Ios
-  DEPENDS QmlDebug Qt5::Xml
+  DEPENDS QmlDebug Qt::Xml
  PLUGIN_DEPENDS Core Debugger ProjectExplorer QmakeProjectManager CMakeProjectManager
  SOURCES
    createsimulatordialog.cpp createsimulatordialog.h
--- a/src/plugins/languageclient/CMakeLists.txt
+++ b/src/plugins/languageclient/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_qtc_plugin(LanguageClient
-  PUBLIC_DEPENDS LanguageServerProtocol Qt5::Core app_version
+  PUBLIC_DEPENDS LanguageServerProtocol Qt::Core app_version
  PLUGIN_DEPENDS ProjectExplorer Core TextEditor
  SOURCES
    client.cpp client.h
--- a/src/plugins/mcusupport/CMakeLists.txt
+++ b/src/plugins/mcusupport/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_qtc_plugin(McuSupport
-  DEPENDS Qt5::Core
+  DEPENDS Qt::Core
  PLUGIN_DEPENDS Core BareMetal ProjectExplorer Debugger CMakeProjectManager QtSupport
  SOURCES
    mcukitinformation.cpp mcukitinformation.h
--- a/src/plugins/mesonprojectmanager/CMakeLists.txt
+++ b/src/plugins/mesonprojectmanager/CMakeLists.txt
@@ -92,7 +92,7 @@ add_qtc_test(tst_mesonwrapper
  INCLUDES
    BEFORE "."
  DEPENDS
-    Qt5::Core Qt5::Test Core
+    Qt::Core Qt::Test Core
    Utils
  DEFINES
     MESON_SAMPLES_DIR="${CMAKE_CURRENT_SOURCE_DIR}/tests/resources"
@@ -113,7 +113,7 @@ add_qtc_test(tst_mesoninfoparser
  INCLUDES
    BEFORE "."
  DEPENDS
-    Qt5::Core Qt5::Test Core
+    Qt::Core Qt::Test Core
    Utils
  DEFINES
     MESON_SAMPLES_DIR="${CMAKE_CURRENT_SOURCE_DIR}/tests/resources"
@@ -134,7 +134,7 @@ add_qtc_test(tst_ninjaparser
  INCLUDES
    BEFORE "."
  DEPENDS
-    Qt5::Core Qt5::Test Core
+    Qt::Core Qt::Test Core
    Utils ProjectExplorer
  SOURCES
    tests/testninjaparser.cpp
@@ -147,7 +147,7 @@ add_qtc_test(tst_mesonparser
  DEFINES
    MESONPARSER_DISABLE_TASKS_FOR_TESTS
  DEPENDS
-    Qt5::Core Qt5::Test Core
+    Qt::Core Qt::Test Core
    Utils ProjectExplorer
  SOURCES
    tests/testmesonparser.cpp
--- a/src/plugins/modeleditor/CMakeLists.txt
+++ b/src/plugins/modeleditor/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_qtc_plugin(ModelEditor
-  DEPENDS Modeling Qt5::Core Qt5::Gui Qt5::Widgets
+  DEPENDS Modeling Qt::Core Qt::Gui Qt::Widgets
  PLUGIN_DEPENDS Core CppEditor ProjectExplorer
  SOURCES
    actionhandler.cpp actionhandler.h
--- a/src/plugins/perfprofiler/CMakeLists.txt
+++ b/src/plugins/perfprofiler/CMakeLists.txt
@@ -41,7 +41,7 @@ set(PERFPROFILER_CPP_SOURCES

 add_qtc_plugin(PerfProfiler
  CONDITION TARGET Tracing
-  DEPENDS Tracing Qt5::QuickWidgets
+  DEPENDS Tracing Qt::QuickWidgets
  PLUGIN_DEPENDS Core Debugger ProjectExplorer QtSupport
  SOURCES
    ${TEST_SOURCES}
--- a/src/plugins/projectexplorer/CMakeLists.txt
+++ b/src/plugins/projectexplorer/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_qtc_plugin(ProjectExplorer
-  DEPENDS Qt5::Qml
+  DEPENDS Qt::Qml
  PLUGIN_DEPENDS Core TextEditor
  PLUGIN_TEST_DEPENDS GenericProjectManager
  SOURCES
--- a/src/plugins/qbsprojectmanager/CMakeLists.txt
+++ b/src/plugins/qbsprojectmanager/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_qtc_plugin(QbsProjectManager
-  DEPENDS Qt5::Qml Qt5::Widgets QmlJS
+  DEPENDS Qt::Qml Qt::Widgets QmlJS
  DEFINES
    IDE_LIBRARY_BASENAME="${IDE_LIBRARY_BASE_PATH}"
  PLUGIN_DEPENDS Core ProjectExplorer CppEditor QtSupport QmlJSTools
--- a/src/plugins/qmldesigner/CMakeLists.txt
+++ b/src/plugins/qmldesigner/CMakeLists.txt
@@ -1,8 +1,8 @@
 add_qtc_plugin(QmlDesigner
-  CONDITION Qt5_VERSION VERSION_GREATER_EQUAL 6.2.0 AND TARGET Qt5::QuickWidgets AND TARGET Qt5::Svg
+  CONDITION Qt5_VERSION VERSION_GREATER_EQUAL 6.2.0 AND TARGET Qt::QuickWidgets AND TARGET Qt::Svg
  DEPENDS
    QmlJS LanguageUtils QmlEditorWidgets AdvancedDockingSystem
-    Qt5::QuickWidgets Qt5::CorePrivate Sqlite Qt5::Xml Qt5::Svg
+    Qt::QuickWidgets Qt::CorePrivate Sqlite Qt::Xml Qt::Svg
  PLUGIN_DEPENDS
    Core ProjectExplorer QmlJSEditor QmlProjectManager
    QtSupport
@@ -29,7 +29,7 @@ add_feature_info("Build with QmlDom" ${WITH_QMLDOM} "")

 add_qtc_library(QmlDesignerUtils STATIC
  DEPENDS
-    Qt5::Gui
+    Qt::Gui
  DEFINES QMLDESIGNERUTILS_LIBRARY
  PUBLIC_DEFINES $<$<BOOL:${QTC_STATIC_BUILD}>:QMLDESIGNER_STATIC_LIBRARY>
  PUBLIC_INCLUDES ${CMAKE_CURRENT_LIST_DIR}/utils
@@ -45,11 +45,11 @@ add_qtc_library(QmlDesignerUtils STATIC
 add_qtc_library(QmlDesignerCore STATIC
  DEPENDS
    Threads::Threads
-    Qt5::CorePrivate
+    Qt::CorePrivate
    CPlusPlus
    Utils
-    Qt5::Widgets
-    Qt5::Qml
+    Qt::Widgets
+    Qt::Qml
    Core
    ProjectExplorer
    QmakeProjectManager
@@ -524,17 +524,13 @@ endif()


 if (QTC_STATIC_BUILD AND TARGET QmlDesigner)
-  get_target_property(_designerType Qt5::Designer TYPE)
-  if (${_designerType} STREQUAL "STATIC_LIBRARY")
-    extend_qtc_target(QmlDesigner PUBLIC_DEFINES QT_DESIGNER_STATIC)
-  endif()
  extend_qtc_target(QmlDesigner PUBLIC_DEPENDS TextEditor)
 endif()

 add_qtc_plugin(assetexporterplugin
  PLUGIN_CLASS AssetExporterPlugin
  CONDITION TARGET QmlDesigner
-  DEPENDS Core ProjectExplorer QmlDesigner Utils Qt5::Qml Qt5::QuickPrivate
+  DEPENDS Core ProjectExplorer QmlDesigner Utils Qt::Qml Qt::QuickPrivate
  PUBLIC_INCLUDES assetexporterplugin
  SOURCES
    assetexporterplugin/assetexportdialog.h assetexporterplugin/assetexportdialog.cpp assetexporterplugin/assetexportdialog.ui
@@ -556,7 +552,7 @@ add_qtc_plugin(assetexporterplugin
 add_qtc_plugin(componentsplugin
  PLUGIN_CLASS ComponentsPlugin
  CONDITION TARGET QmlDesigner
-  DEPENDS Core QmlDesigner Utils Qt5::Qml
+  DEPENDS Core QmlDesigner Utils Qt::Qml
  DEFINES COMPONENTS_LIBRARY
  SOURCES
    componentsplugin/addtabdesigneraction.cpp componentsplugin/addtabdesigneraction.h
@@ -572,7 +568,7 @@ add_qtc_plugin(componentsplugin
 add_qtc_plugin(qmlpreviewplugin
  PLUGIN_CLASS QmlPreviewWidgetPlugin
  CONDITION TARGET QmlDesigner
-  DEPENDS Core ProjectExplorer QmlDesigner Utils Qt5::Qml
+  DEPENDS Core ProjectExplorer QmlDesigner Utils Qt::Qml
  SOURCES
    qmlpreviewplugin/qmlpreviewactions.cpp qmlpreviewplugin/qmlpreviewactions.h
    qmlpreviewplugin/qmlpreviewplugin.cpp qmlpreviewplugin/qmlpreviewplugin.h
@@ -583,7 +579,7 @@ add_qtc_plugin(qmlpreviewplugin
 add_qtc_plugin(qtquickplugin
  PLUGIN_CLASS QtQuickPlugin
  CONDITION TARGET QmlDesigner
-  DEPENDS Core QmlDesigner Utils Qt5::Qml
+  DEPENDS Core QmlDesigner Utils Qt::Qml
  DEFINES QTQUICK_LIBRARY
  SOURCES
    qtquickplugin/qtquickplugin.cpp qtquickplugin/qtquickplugin.h
--- a/src/plugins/qmlpreview/CMakeLists.txt
+++ b/src/plugins/qmlpreview/CMakeLists.txt
@@ -38,7 +38,7 @@ if(TARGET Qt${QT_VERSION_MAJOR}::QmlPrivate)
  )
  extend_qtc_plugin(QmlPreview
    CONDITION have_qml_debug_translation_protocol
-    PUBLIC_DEPENDS Qt5::QmlPrivate
+    PUBLIC_DEPENDS Qt::QmlPrivate
    PUBLIC_DEFINES "FOUND_QML_DEBUG_TRANSLATION_PROTOCOL"
  )
 endif()
--- a/src/plugins/qmlprofiler/CMakeLists.txt
+++ b/src/plugins/qmlprofiler/CMakeLists.txt
@@ -77,7 +77,7 @@ find_package(Qt6 COMPONENTS ShaderTools QUIET)

 add_qtc_plugin(QmlProfiler
  CONDITION TARGET Tracing AND TARGET Qt6::ShaderTools
-  DEPENDS QmlDebug QmlJS Tracing Qt5::QuickWidgets
+  DEPENDS QmlDebug QmlJS Tracing Qt::QuickWidgets
  PLUGIN_DEPENDS Core Debugger ProjectExplorer QtSupport TextEditor
  SOURCES
    ${TEST_SOURCES}
--- a/src/plugins/qmlprojectmanager/CMakeLists.txt
+++ b/src/plugins/qmlprojectmanager/CMakeLists.txt
@@ -1,7 +1,7 @@
 add_qtc_plugin(QmlProjectManager
-  CONDITION TARGET Qt5::QuickWidgets
+  CONDITION TARGET Qt::QuickWidgets
  PLUGIN_CLASS QmlProjectPlugin
-  DEPENDS QmlJS Qt5::QuickWidgets
+  DEPENDS QmlJS Qt::QuickWidgets
  PLUGIN_DEPENDS Core ProjectExplorer QtSupport
  SOURCES
    fileformat/filefilteritems.cpp fileformat/filefilteritems.h
--- a/src/plugins/qnx/CMakeLists.txt
+++ b/src/plugins/qnx/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_qtc_plugin(Qnx
-  DEPENDS QmlDebug Qt5::Xml
+  DEPENDS QmlDebug Qt::Xml
  PLUGIN_DEPENDS Core Debugger ProjectExplorer QtSupport RemoteLinux
  SOURCES
    qnx.qrc
--- a/src/plugins/qtsupport/CMakeLists.txt
+++ b/src/plugins/qtsupport/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_qtc_plugin(QtSupport
-  DEPENDS Qt5::Xml
+  DEPENDS Qt::Xml
  PUBLIC_DEPENDS ProParser
  PLUGIN_DEPENDS Core ProjectExplorer ResourceEditor
  SOURCES
--- a/src/plugins/resourceeditor/CMakeLists.txt
+++ b/src/plugins/resourceeditor/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_qtc_plugin(ResourceEditor
-  DEPENDS Qt5::Xml
+  DEPENDS Qt::Xml
  PLUGIN_DEPENDS Core ProjectExplorer
  SOURCES
    qrceditor/qrceditor.cpp qrceditor/qrceditor.h
--- a/src/plugins/serialterminal/CMakeLists.txt
+++ b/src/plugins/serialterminal/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_qtc_plugin(SerialTerminal
-  CONDITION TARGET Qt5::SerialPort
-  DEPENDS Qt5::SerialPort
+  CONDITION TARGET Qt::SerialPort
+  DEPENDS Qt::SerialPort
  PLUGIN_DEPENDS Core TextEditor
  SOURCES
    consolelineedit.cpp consolelineedit.h
--- a/src/plugins/studiowelcome/CMakeLists.txt
+++ b/src/plugins/studiowelcome/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_qtc_plugin(StudioWelcome
-  CONDITION TARGET Qt5::QuickWidgets AND TARGET QmlDesigner
-  DEPENDS Qt5::QuickWidgets Qt5::QmlPrivate
+  CONDITION TARGET Qt::QuickWidgets AND TARGET QmlDesigner
+  DEPENDS Qt::QuickWidgets Qt::QmlPrivate
  PLUGIN_DEPENDS Core ProjectExplorer QtSupport QmlDesigner
  DEFINES STUDIO_QML_PATH="${CMAKE_CURRENT_SOURCE_DIR}/qml/"
  SOURCES
--- a/src/plugins/texteditor/CMakeLists.txt
+++ b/src/plugins/texteditor/CMakeLists.txt
@@ -5,7 +5,7 @@ else()
 endif()

 add_qtc_plugin(TextEditor
-  DEPENDS Qt5::Concurrent Qt5::Network Qt5::PrintSupport Qt5::Xml
+  DEPENDS Qt::Concurrent Qt::Network Qt::PrintSupport Qt::Xml
  PUBLIC_DEPENDS ${KSYNTAXHIGHLIGHTING_TARGET}
  PLUGIN_DEPENDS Core
  SOURCES
--- a/src/plugins/updateinfo/CMakeLists.txt
+++ b/src/plugins/updateinfo/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_qtc_plugin(UpdateInfo
-  DEPENDS Qt5::Xml
+  DEPENDS Qt::Xml
  PLUGIN_DEPENDS Core
  PLUGIN_JSON_IN UPDATEINFO_EXPERIMENTAL_STR=true
  SOURCES
--- a/src/plugins/webassembly/CMakeLists.txt
+++ b/src/plugins/webassembly/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_qtc_plugin(WebAssembly
-  DEPENDS Qt5::Core
+  DEPENDS Qt::Core
  PLUGIN_DEPENDS Core ProjectExplorer QtSupport
  SOURCES
    webassembly.qrc
--- a/src/shared/designerintegrationv2/CMakeLists.txt
+++ b/src/shared/designerintegrationv2/CMakeLists.txt
@@ -1,9 +1,9 @@
-if (NOT TARGET Qt5::Designer)
+if (NOT TARGET Qt::Designer)
  return()
 endif()

 add_qtc_library(designerintegrationv2 STATIC
-  DEPENDS Qt5::Designer Qt5::Widgets
+  DEPENDS Qt::Designer Qt::Widgets
  PUBLIC_INCLUDES
    "${CMAKE_CURRENT_LIST_DIR}"
  SOURCES
@@ -14,7 +14,9 @@ add_qtc_library(designerintegrationv2 STATIC
 )

 if (QTC_STATIC_BUILD)
-  get_target_property(_designerType Qt5::Designer TYPE)
+  # version-less target Qt::Designer is an interface library that links to QtX::Designer
+  get_target_property(_designer Qt::Designer INTERFACE_LINK_LIBRARIES)
+  get_target_property(_designerType ${_designer} TYPE)
  if (${_designerType} STREQUAL "STATIC_LIBRARY")
    extend_qtc_target(designerintegrationv2 PUBLIC_DEFINES QT_DESIGNER_STATIC)
  endif()
--- a/src/shared/help/CMakeLists.txt
+++ b/src/shared/help/CMakeLists.txt
@@ -1,5 +1,5 @@
-if (NOT TARGET Qt5::Help)
-  # Do not built without Qt5::Help being available
+if (NOT TARGET Qt::Help)
+  # Do not built without Qt::Help being available
  return()
 endif()

@@ -12,7 +12,7 @@ if (isMultiConfig)
 endif()

 add_qtc_library(shared_help STATIC
-  DEPENDS Utils Core PUBLIC Qt5::Help Qt5::PrintSupport Qt5::Widgets
+  DEPENDS Utils Core PUBLIC Qt::Help Qt::PrintSupport Qt::Widgets
  PUBLIC_INCLUDES
    "${PLUGIN_SOURCE_DIR}/help"
    "${PLUGIN_SOURCE_DIR}"
--- a/src/shared/proparser/CMakeLists.txt
+++ b/src/shared/proparser/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_qtc_library(ProParser
-  DEPENDS Qt5::Core Utils
+  DEPENDS Qt::Core Utils
  PUBLIC_DEFINES
    QMAKE_BUILTIN_PRFS QMAKE_OVERRIDE_PRFS
    PROPARSER_THREAD_SAFE PROEVALUATOR_CUMULATIVE PROEVALUATOR_DUAL_VFS
--- a/src/shared/qtlockedfile/CMakeLists.txt
+++ b/src/shared/qtlockedfile/CMakeLists.txt
@@ -5,7 +5,7 @@ else()
 endif()

 add_library(shared_qtlockedfile STATIC ${OS_SOURCES} qtlockedfile.cpp qtlockedfile.h)
-target_link_libraries(shared_qtlockedfile Qt5::Core)
+target_link_libraries(shared_qtlockedfile Qt::Core)
 target_include_directories(shared_qtlockedfile PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
 if (WIN32)
  target_compile_definitions(shared_qtlockedfile PRIVATE
--- a/src/shared/qtsingleapplication/CMakeLists.txt
+++ b/src/shared/qtsingleapplication/CMakeLists.txt
@@ -2,7 +2,7 @@ add_library(shared_qtsingleapplication STATIC
  qtsingleapplication.cpp qtsingleapplication.h
  qtlocalpeer.cpp qtlocalpeer.h
 )
-target_link_libraries(shared_qtsingleapplication shared_qtlockedfile Qt5::Core Qt5::Network Qt5::Widgets)
+target_link_libraries(shared_qtsingleapplication shared_qtlockedfile Qt::Core Qt::Network Qt::Widgets)
 target_include_directories(shared_qtsingleapplication PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
 if (WIN32)
  target_compile_definitions(shared_qtsingleapplication PRIVATE "QT_QTSINGLEAPPLICATION_EXPORT=__declspec(dllexport)")
--- a/src/shared/registryaccess/CMakeLists.txt
+++ b/src/shared/registryaccess/CMakeLists.txt
@@ -1,6 +1,6 @@
 if (WIN32)
    add_library(registryaccess STATIC registryaccess.cpp registryaccess.h)
-    target_link_libraries(registryaccess PUBLIC advapi32 ole32 shell32 Qt5::Widgets)
+    target_link_libraries(registryaccess PUBLIC advapi32 ole32 shell32 Qt::Widgets)
    target_compile_definitions(registryaccess PRIVATE _UNICODE UNICODE)
    target_include_directories(registryaccess PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 else()
--- a/src/tools/CMakeLists.txt
+++ b/src/tools/CMakeLists.txt
@@ -8,7 +8,7 @@ function(add_qtc_cpp_tool name)
    DEFINES
      PATH_PREPROCESSOR_CONFIG=\"${CMAKE_CURRENT_SOURCE_DIR}/cplusplus-shared/pp-configuration.inc\"
      ${ARGN}
-    DEPENDS CPlusPlus Utils Qt5::Widgets
+    DEPENDS CPlusPlus Utils Qt::Widgets
    INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/cplusplus-shared"
      "${CMAKE_CURRENT_SOURCE_DIR}/${name}"
    SOURCES
--- a/src/tools/iostool/CMakeLists.txt
+++ b/src/tools/iostool/CMakeLists.txt
@@ -1,9 +1,9 @@
 add_qtc_executable(iostool
  DESTINATION ${IDE_LIBEXEC_PATH}/ios
  DEPENDS
-    Qt5::Core
-    Qt5::Xml
-    Qt5::Network
+    Qt::Core
+    Qt::Xml
+    Qt::Network
    ${FWCoreFoundation}
    ${FWCoreServices}
    ${FWIOKit}
--- a/src/tools/processlauncher/CMakeLists.txt
+++ b/src/tools/processlauncher/CMakeLists.txt
@@ -2,7 +2,7 @@ set(UTILSDIR "${PROJECT_SOURCE_DIR}/src/libs/utils")

 add_qtc_executable(qtcreator_processlauncher
  INCLUDES "${UTILSDIR}"
-  DEPENDS Qt5::Core Qt5::Network
+  DEPENDS Qt::Core Qt::Network
  DEFINES UTILS_STATIC_LIBRARY
  SOURCES
    launcherlogging.cpp
--- a/src/tools/qml2puppet/CMakeLists.txt
+++ b/src/tools/qml2puppet/CMakeLists.txt
@@ -31,10 +31,10 @@ endif()

 add_qtc_executable(qml2puppet
  ${DESTINATION}
-  CONDITION TARGET Qt5::Quick
+  CONDITION TARGET Qt::Quick
  DEPENDS
-    Qt5::CorePrivate Qt5::Widgets Qt5::QmlPrivate
-    Qt5::QuickPrivate Qt5::Network Qt5::GuiPrivate
+    Qt::CorePrivate Qt::Widgets Qt::QmlPrivate
+    Qt::QuickPrivate Qt::Network Qt::GuiPrivate
    QmlPuppetCommunication
  INCLUDES
    ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
@@ -89,9 +89,9 @@ extend_qtc_executable(qml2puppet

 find_package(Qt5 5.15.0 COMPONENTS Quick3D QUIET)
 extend_qtc_executable(qml2puppet
-  CONDITION TARGET Qt5::Quick3D
+  CONDITION TARGET Qt::Quick3D
  FEATURE_INFO "Qt Quick 3D support"
-  DEPENDS Qt5::Quick3D Qt5::Quick3DPrivate
+  DEPENDS Qt::Quick3D Qt::Quick3DPrivate
  DEFINES QUICK3D_MODULE

  SOURCES_PREFIX qml2puppet/editor3d
@@ -109,26 +109,26 @@ extend_qtc_executable(qml2puppet

 find_package(Qt5 5.15.0 COMPONENTS Quick3DAssetImport QUIET)
 extend_qtc_executable(qml2puppet
-  CONDITION TARGET Qt5::Quick3DAssetImport
+  CONDITION TARGET Qt::Quick3DAssetImport
  FEATURE_INFO "Qt Quick 3D asset import"
-  DEPENDS Qt5::Quick3DAssetImportPrivate
+  DEPENDS Qt::Quick3DAssetImportPrivate
  DEFINES IMPORT_QUICK3D_ASSETS
 )

 find_package(Qt5 5.15.0 COMPONENTS Quick3DParticles QUIET)
 extend_qtc_executable(qml2puppet
-  CONDITION TARGET Qt5::Quick3DParticles
+  CONDITION TARGET Qt::Quick3DParticles
  FEATURE_INFO "Qt Quick 3D particles"
-  DEPENDS Qt5::Quick3DParticles Qt5::Quick3DParticlesPrivate
+  DEPENDS Qt::Quick3DParticles Qt::Quick3DParticlesPrivate
  DEFINES QUICK3D_PARTICLES_MODULE
 )

 # Quick3DAssetUtils optionally depends on QuickTimeline, so find also it to make the CI build work
 find_package(Qt5 5.15.0 COMPONENTS Quick3DAssetUtils QuickTimeline QUIET)
 extend_qtc_executable(qml2puppet
-  CONDITION TARGET Qt5::Quick3DAssetUtils
+  CONDITION TARGET Qt::Quick3DAssetUtils
  FEATURE_INFO "Qt Quick 3D asset utils"
-  DEPENDS Qt5::Quick3DAssetUtilsPrivate
+  DEPENDS Qt::Quick3DAssetUtilsPrivate
  DEFINES QUICK3D_ASSET_UTILS_MODULE
 )

--- a/src/tools/qtc-askpass/CMakeLists.txt
+++ b/src/tools/qtc-askpass/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_qtc_executable(qtc-askpass
-  DEPENDS Qt5::Widgets
+  DEPENDS Qt::Widgets
  SOURCES
    qtc-askpass-main.cpp
 )
--- a/src/tools/qtcdebugger/CMakeLists.txt
+++ b/src/tools/qtcdebugger/CMakeLists.txt
@@ -3,7 +3,7 @@ if (NOT WIN32)
 endif()

 add_qtc_executable(qtcdebugger
-  DEPENDS Qt5::Widgets registryaccess psapi app_version
+  DEPENDS Qt::Widgets registryaccess psapi app_version
  SOURCES
    main.cpp
  PROPERTIES WIN32_EXECUTABLE ON
--- a/src/tools/qtcreatorcrashhandler/CMakeLists.txt
+++ b/src/tools/qtcreatorcrashhandler/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_qtc_executable(qtcreator_crash_handler
  CONDITION UNIX AND NOT APPLE AND (CMAKE_BUILD_TYPE STREQUAL "Debug")
-  DEPENDS app_version Utils Qt5::Widgets
+  DEPENDS app_version Utils Qt::Widgets
  SOURCES
    backtracecollector.cpp backtracecollector.h
    crashhandler.cpp crashhandler.h
--- a/src/tools/qtpromaker/CMakeLists.txt
+++ b/src/tools/qtpromaker/CMakeLists.txt
@@ -1 +1 @@
-add_qtc_executable(qtpromaker DEPENDS Qt5::Core SOURCES main.cpp)
+add_qtc_executable(qtpromaker DEPENDS Qt::Core SOURCES main.cpp)
--- a/src/tools/sdktool/CMakeLists.txt
+++ b/src/tools/sdktool/CMakeLists.txt
@@ -36,7 +36,7 @@ file(RELATIVE_PATH DATA_PATH "/${IDE_LIBEXEC_PATH}" "/${IDE_DATA_PATH}")
 add_qtc_library(sdktoolLib
  STATIC
  DEFINES DATA_PATH=\"${DATA_PATH}\"
-  PUBLIC_DEPENDS Qt5::Core
+  PUBLIC_DEPENDS Qt::Core
  PUBLIC_INCLUDES ${CMAKE_CURRENT_SOURCE_DIR} "${UtilsSourcesDir}/../"
  INCLUDES
    ${CMAKE_CURRENT_BINARY_DIR}
--- a/src/tools/valgrindfake/CMakeLists.txt
+++ b/src/tools/valgrindfake/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_qtc_executable(valgrind-fake
  SKIP_INSTALL
-  DEPENDS Qt5::Network Qt5::Xml
+  DEPENDS Qt::Network Qt::Xml
  SOURCES main.cpp outputgenerator.cpp outputgenerator.h
  PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
 )
--- a/tests/auto/aggregation/CMakeLists.txt
+++ b/tests/auto/aggregation/CMakeLists.txt
@@ -1,4 +1,4 @@
 add_qtc_test(tst_aggregation
-  DEPENDS Aggregation Qt5::Core
+  DEPENDS Aggregation Qt::Core
  SOURCES tst_aggregate.cpp
 )
--- a/tests/auto/debugger/CMakeLists.txt
+++ b/tests/auto/debugger/CMakeLists.txt
@@ -20,7 +20,7 @@ if (NOT QT_CREATOR_API_DEFINED)
  set(CMAKE_CXX_STANDARD_REQUIRED ON)
  set(CMAKE_CXX_EXTENSIONS OFF)

-  set(IMPLICIT_DEPENDS Qt5::Test)
+  set(IMPLICIT_DEPENDS Qt::Test)

  include(QtCreatorIDEBranding)
  include(QtCreatorAPI)
@@ -46,12 +46,12 @@ add_qtc_test(tst_debugger_disassembler

 option(WITH_DEBUGGER_DUMPERS "Include tests for debugger pretty printers" ON)
 if (WITH_DEBUGGER_DUMPERS)
-  get_target_property(qmake_binary Qt5::qmake IMPORTED_LOCATION)
+  get_target_property(qmake_binary Qt::qmake IMPORTED_LOCATION)

  add_qtc_test(tst_debugger_dumpers
    EXCLUDE_FROM_PRECHECK
    TIMEOUT 0
-    DEPENDS Qt5::Network Utils
+    DEPENDS Qt::Network Utils
    DEFINES
      DUMPERDIR="${PROJECT_SOURCE_DIR}/share/qtcreator/debugger"
      DEFAULT_QMAKE_BINARY="${qmake_binary}"
@@ -68,7 +68,7 @@ if (WITH_DEBUGGER_DUMPERS)
 endif()

 add_qtc_test(tst_debugger_gdb
-  DEPENDS Qt5::Network Utils
+  DEPENDS Qt::Network Utils
  INCLUDES "${DEBUGGERDIR}"
  SOURCES
    tst_gdb.cpp
@@ -77,7 +77,7 @@ add_qtc_test(tst_debugger_gdb
 )

 add_qtc_test(tst_debugger_protocol
-  DEPENDS Qt5::Network Utils
+  DEPENDS Qt::Network Utils
  INCLUDES
    "${DEBUGGERDIR}"
  SOURCES
@@ -87,7 +87,7 @@ add_qtc_test(tst_debugger_protocol
 )

 add_qtc_test(tst_debugger_offsets
-  DEPENDS Qt5::CorePrivate
+  DEPENDS Qt::CorePrivate
  INCLUDES "${DEBUGGERDIR}"
  SOURCES tst_offsets.cpp
 )
--- a/tests/auto/qml/qmldesigner/coretests/CMakeLists.txt
+++ b/tests/auto/qml/qmldesigner/coretests/CMakeLists.txt
@@ -4,8 +4,8 @@ add_qtc_test(tst_qml_testcore
  DEPENDS
    Sqlite
    QmlDesignerCore
-    Qt5::Widgets
-    Qt5::Qml
+    Qt::Widgets
+    Qt::Qml
  DEFINES
    QT_CREATOR
    IDE_PLUGIN_PATH="${PROJECT_BINARY_DIR}/${IDE_PLUGIN_PATH}"
--- a/tests/auto/tracing/flamegraph/CMakeLists.txt
+++ b/tests/auto/tracing/flamegraph/CMakeLists.txt
@@ -1,4 +1,4 @@
 add_qtc_test(tst_tracing_flamegraph
-  DEPENDS Tracing Qt5::Quick
+  DEPENDS Tracing Qt::Quick
  SOURCES tst_flamegraph.cpp
 )
--- a/tests/auto/tracing/flamegraphview/CMakeLists.txt
+++ b/tests/auto/tracing/flamegraphview/CMakeLists.txt
@@ -5,7 +5,7 @@ set(TSTFLAMEGRAPHVIEW_CPP_SOURCES

 add_qtc_test(tst_tracing_flamegraphview
  EXCLUDE_FROM_PRECHECK
-  DEPENDS Tracing Qt5::QuickWidgets Qt5::Quick Utils
+  DEPENDS Tracing Qt::QuickWidgets Qt::Quick Utils
 )

 if (NOT TARGET tst_tracing_flamegraphview) # qt_add_qml_module has no DEPENDS check
--- a/tests/auto/tracing/timelineabstractrenderer/CMakeLists.txt
+++ b/tests/auto/tracing/timelineabstractrenderer/CMakeLists.txt
@@ -1,4 +1,4 @@
 add_qtc_test(tst_tracing_timelineabstractrenderer
-  DEPENDS Tracing Qt5::Gui Qt5::Quick
+  DEPENDS Tracing Qt::Gui Qt::Quick
  SOURCES tst_timelineabstractrenderer.cpp
 )
--- a/tests/auto/tracing/timelineitemsrenderpass/CMakeLists.txt
+++ b/tests/auto/tracing/timelineitemsrenderpass/CMakeLists.txt
@@ -1,4 +1,4 @@
 add_qtc_test(tst_tracing_timelineitemsrenderpass
-  DEPENDS Tracing Qt5::Quick
+  DEPENDS Tracing Qt::Quick
  SOURCES tst_timelineitemsrenderpass.cpp
 )
--- a/tests/auto/tracing/timelinemodel/CMakeLists.txt
+++ b/tests/auto/tracing/timelinemodel/CMakeLists.txt
@@ -1,4 +1,4 @@
 add_qtc_test(tst_tracing_timelinemodel
-  DEPENDS Tracing Qt5::Gui
+  DEPENDS Tracing Qt::Gui
  SOURCES tst_timelinemodel.cpp
 )
--- a/tests/auto/tracing/timelinemodelaggregator/CMakeLists.txt
+++ b/tests/auto/tracing/timelinemodelaggregator/CMakeLists.txt
@@ -1,4 +1,4 @@
 add_qtc_test(tst_tracing_timelinemodelaggregator
-  DEPENDS Tracing Qt5::Gui
+  DEPENDS Tracing Qt::Gui
  SOURCES tst_timelinemodelaggregator.cpp
 )
--- a/tests/auto/tracing/timelinenotesmodel/CMakeLists.txt
+++ b/tests/auto/tracing/timelinenotesmodel/CMakeLists.txt
@@ -1,4 +1,4 @@
 add_qtc_test(tst_tracing_timelinenotesmodel
-  DEPENDS Tracing Qt5::Gui
+  DEPENDS Tracing Qt::Gui
  SOURCES tst_timelinenotesmodel.cpp
 )
--- a/tests/auto/tracing/timelinenotesrenderpass/CMakeLists.txt
+++ b/tests/auto/tracing/timelinenotesrenderpass/CMakeLists.txt
@@ -1,4 +1,4 @@
 add_qtc_test(tst_tracing_timelinenotesrenderpass
-  DEPENDS Tracing Qt5::Quick
+  DEPENDS Tracing Qt::Quick
  SOURCES tst_timelinenotesrenderpass.cpp
 )
--- a/tests/auto/tracing/timelineoverviewrenderer/CMakeLists.txt
+++ b/tests/auto/tracing/timelineoverviewrenderer/CMakeLists.txt
@@ -1,4 +1,4 @@
 add_qtc_test(tst_tracing_timelineoverviewrenderer
-  DEPENDS Tracing Qt5::Quick
+  DEPENDS Tracing Qt::Quick
  SOURCES tst_timelineoverviewrenderer.cpp
 )
--- a/tests/auto/tracing/timelinerenderer/CMakeLists.txt
+++ b/tests/auto/tracing/timelinerenderer/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_qtc_test(tst_tracing_timelinerenderer
  EXCLUDE_FROM_PRECHECK
-  DEPENDS Tracing Qt5::Gui Qt5::Quick
+  DEPENDS Tracing Qt::Gui Qt::Quick
  SOURCES tst_timelinerenderer.cpp
 )
--- a/tests/auto/tracing/timelinerenderstate/CMakeLists.txt
+++ b/tests/auto/tracing/timelinerenderstate/CMakeLists.txt
@@ -1,4 +1,4 @@
 add_qtc_test(tst_tracing_timelinerenderstate
-  DEPENDS Tracing Qt5::Gui Qt5::Quick
+  DEPENDS Tracing Qt::Gui Qt::Quick
  SOURCES tst_timelinerenderstate.cpp
 )
--- a/tests/auto/tracing/timelineselectionrenderpass/CMakeLists.txt
+++ b/tests/auto/tracing/timelineselectionrenderpass/CMakeLists.txt
@@ -1,4 +1,4 @@
 add_qtc_test(tst_tracing_timelineselectionrenderpass
-  DEPENDS Tracing Qt5::Quick
+  DEPENDS Tracing Qt::Quick
  SOURCES tst_timelineselectionrenderpass.cpp
 )
--- a/tests/auto/tracing/timelinezoomcontrol/CMakeLists.txt
+++ b/tests/auto/tracing/timelinezoomcontrol/CMakeLists.txt
@@ -1,4 +1,4 @@
 add_qtc_test(tst_tracing_timelinezoomcontrol
-  DEPENDS Tracing Qt5::Gui
+  DEPENDS Tracing Qt::Gui
  SOURCES tst_timelinezoomcontrol.cpp
 )
--- a/tests/auto/updateinfo/CMakeLists.txt
+++ b/tests/auto/updateinfo/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_qtc_test(tst_updateinfo
  INCLUDES ${PROJECT_SOURCE_DIR}/src/plugins
-  DEPENDS Utils Qt5::Xml
+  DEPENDS Utils Qt::Xml
  SOURCES tst_updateinfo.cpp
 )
--- a/tests/auto/valgrind/callgrind/CMakeLists.txt
+++ b/tests/auto/valgrind/callgrind/CMakeLists.txt
@@ -1,7 +1,7 @@
 include(../valgrind.cmake)

 add_qtc_test(tst_callgrindparsertests
-  DEPENDS Utils Core ProjectExplorer Debugger Qt5::Core Qt5::Network
+  DEPENDS Utils Core ProjectExplorer Debugger Qt::Core Qt::Network
  DEFINES
    PARSERTESTS_DATA_DIR="${CMAKE_CURRENT_LIST_DIR}/data"
    CALLGRINDPARSERTESTS
--- a/tests/auto/valgrind/memcheck/testapps/leak1/CMakeLists.txt
+++ b/tests/auto/valgrind/memcheck/testapps/leak1/CMakeLists.txt
@@ -1,5 +1,5 @@
 include(../testapp.cmake)

 add_valgrind_testapp(leak1)
-target_link_libraries(leak1 PRIVATE Qt5::Core)
+target_link_libraries(leak1 PRIVATE Qt::Core)

--- a/tests/auto/valgrind/memcheck/testapps/leak4/CMakeLists.txt
+++ b/tests/auto/valgrind/memcheck/testapps/leak4/CMakeLists.txt
@@ -1,4 +1,4 @@
 include(../testapp.cmake)

 add_valgrind_testapp(leak4)
-target_link_libraries(leak4 PRIVATE Qt5::Core)
+target_link_libraries(leak4 PRIVATE Qt::Core)
--- a/tests/manual/proparser/CMakeLists.txt
+++ b/tests/manual/proparser/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_qtc_test(tst_manual_proparser
  MANUALTEST
-  DEPENDS Qt5::Core Qt5::Core5Compat
+  DEPENDS Qt::Core Qt::Core5Compat
  DEFINES
    "QMAKE_BUILTIN_PRFS"
    "QT_NO_CAST_TO_ASCII"
--- a/tests/manual/widgets/crumblepath/CMakeLists.txt
+++ b/tests/manual/widgets/crumblepath/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_qtc_test(tst_manual_widgets_crumblepath
  MANUALTEST
-  DEPENDS Qt5::Gui Utils Core
+  DEPENDS Qt::Gui Utils Core
  SOURCES
    tst_manual_widgets_crumblepath.cpp
    ../common/themeselector.cpp ../common/themeselector.h
--- a/tests/manual/widgets/infolabel/CMakeLists.txt
+++ b/tests/manual/widgets/infolabel/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_qtc_test(tst_manual_widgets_infolabel
  MANUALTEST
-  DEPENDS Qt5::Gui Utils Core
+  DEPENDS Qt::Gui Utils Core
  SOURCES
    tst_manual_widgets_infolabel.cpp
    ../common/themeselector.cpp ../common/themeselector.h
--- a/tests/manual/widgets/layoutbuilder/CMakeLists.txt
+++ b/tests/manual/widgets/layoutbuilder/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_qtc_test(tst_manual_widgets_layoutbuilder
  MANUALTEST
-  DEPENDS Qt5::Gui Utils Core
+  DEPENDS Qt::Gui Utils Core
  SOURCES
    tst_manual_widgets_layoutbuilder.cpp
 )
--- a/Show More
+++ b/Show More