From 55fa109b5935725e8f4c0b1bbd286017b6f52979 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@qt.io>
Date: Tue, 20 Dec 2022 17:31:22 +0100
Subject: 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>
---
 src/shared/designerintegrationv2/CMakeLists.txt | 8 +++++---
 src/shared/help/CMakeLists.txt                  | 6 +++---
 src/shared/proparser/CMakeLists.txt             | 2 +-
 src/shared/qtlockedfile/CMakeLists.txt          | 2 +-
 src/shared/qtsingleapplication/CMakeLists.txt   | 2 +-
 src/shared/registryaccess/CMakeLists.txt        | 2 +-
 6 files changed, 12 insertions(+), 10 deletions(-)

(limited to 'src/shared')

diff --git a/src/shared/designerintegrationv2/CMakeLists.txt b/src/shared/designerintegrationv2/CMakeLists.txt
index e600141bce..8319c028ce 100644
--- 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()
diff --git a/src/shared/help/CMakeLists.txt b/src/shared/help/CMakeLists.txt
index d63f5bbb77..e330fdd23a 100644
--- 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}"
diff --git a/src/shared/proparser/CMakeLists.txt b/src/shared/proparser/CMakeLists.txt
index 0277795a60..0a6d5ca5bb 100644
--- 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
diff --git a/src/shared/qtlockedfile/CMakeLists.txt b/src/shared/qtlockedfile/CMakeLists.txt
index aafb38497f..f7f8a1c666 100644
--- 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
diff --git a/src/shared/qtsingleapplication/CMakeLists.txt b/src/shared/qtsingleapplication/CMakeLists.txt
index b60ee27f94..fae6a08545 100644
--- 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)")
diff --git a/src/shared/registryaccess/CMakeLists.txt b/src/shared/registryaccess/CMakeLists.txt
index 1a7d190cf5..135df2c501 100644
--- 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()
-- 
cgit v1.2.1