Use Qt:: directly

autotests/CMakeLists.txt

@@ -5,7 +5,7 @@ include(ECMAddTests)
 
 find_package(Qt${QT_MAJOR_VERSION}Test ${REQUIRED_QT_VERSION} CONFIG QUIET)
 
-if(NOT TARGET Qt${QT_MAJOR_VERSION}::Test)
+if(NOT TARGET Qt::Test)
     message(STATUS "Qt${QT_MAJOR_VERSION}Test not found, autotests will not be built.")
     return()
 endif()
@@ -19,7 +19,7 @@ ecm_add_test(
     ${CMAKE_SOURCE_DIR}/src/utils/kuniqueservice.cpp
     ${logging_category_srcs}
     TEST_NAME kuniqueservicetest
-    LINK_LIBRARIES ${_kleopatra_dbusaddons_libs} Qt${QT_MAJOR_VERSION}::Test
+    LINK_LIBRARIES ${_kleopatra_dbusaddons_libs} Qt::Test
 )
 
 ecm_add_test(
@@ -27,7 +27,7 @@ ecm_add_test(
     ${CMAKE_SOURCE_DIR}/src/utils/path-helper.cpp
     ${logging_category_srcs}
     TEST_NAME stripsuffixtest
-    LINK_LIBRARIES KF5::I18n KF5::Libkleo Qt${QT_MAJOR_VERSION}::Test
+    LINK_LIBRARIES KF5::I18n KF5::Libkleo Qt::Test
 )
 
 ecm_add_test(
@@ -35,5 +35,5 @@ ecm_add_test(
     ${CMAKE_SOURCE_DIR}/src/utils/keyparameters.cpp
     ${logging_category_srcs}
     TEST_NAME keyparameterstest
-    LINK_LIBRARIES Gpgmepp Qt${QT_MAJOR_VERSION}::Test
+    LINK_LIBRARIES Gpgmepp Qt::Test
 )

src/CMakeLists.txt

@@ -590,8 +590,8 @@ target_link_libraries(kleopatra_bin
   KF5::ItemModels
   KF5::Crash
   ${_kleopatra_mail_libs}
-  Qt${QT_MAJOR_VERSION}::Network
-  Qt${QT_MAJOR_VERSION}::PrintSupport # Printing secret keys
+  Qt::Network
+  Qt::PrintSupport # Printing secret keys
   ${_kleopatra_uiserver_extra_libs}
   ${_kleopatra_dbusaddons_libs}
   kleopatraclientcore

src/libkleopatraclient/core/CMakeLists.txt

@@ -72,6 +72,6 @@ else()
   endif()
 endif()
 
-target_link_libraries(kleopatraclientcore Qt${QT_MAJOR_VERSION}::Widgets KF5::I18n Gpgmepp)
+target_link_libraries(kleopatraclientcore Qt::Widgets KF5::I18n Gpgmepp)
 
 install(TARGETS kleopatraclientcore ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})

src/libkleopatraclient/tests/CMakeLists.txt

@@ -13,7 +13,7 @@ foreach(_kleoclient_test ${kleoclient_TESTS})
 
   target_link_libraries("${_kleoclient_test}"
     kleopatraclientcore
-    Qt${QT_MAJOR_VERSION}::Gui
-    Qt${QT_MAJOR_VERSION}::Core
+    Qt::Gui
+    Qt::Core
 )
 endforeach()

tests/CMakeLists.txt

@@ -23,10 +23,10 @@ ecm_mark_as_test(test_verify)
 
 target_link_libraries(test_verify
   KF5::Libkleo
-  Qt${QT_MAJOR_VERSION}::Test
+  Qt::Test
   KF5::CoreAddons
   KF5::I18n
-  Qt${QT_MAJOR_VERSION}::Widgets
+  Qt::Widgets
 )
 
 if (QT_MAJOR_VERSION STREQUAL "6")