Use Qt:: directly

autotests/CMakeLists.txt

@@ -30,30 +30,30 @@ add_definitions( -DREQUESTER_EXE="${requester_exe_string}" )
 add_subdirectory(benchmarker)
 
 ecm_add_test(mailserializerplugintest.cpp ${CMAKE_BINARY_DIR}/serializers/akonadi_serializer_mail_debug.cpp
-    LINK_LIBRARIES KF5::AkonadiMime KF5::AkonadiCore KF5::AkonadiPrivate KF5::Mime Qt${QT_MAJOR_VERSION}::Test
+    LINK_LIBRARIES KF5::AkonadiMime KF5::AkonadiCore KF5::AkonadiPrivate KF5::Mime Qt::Test
     TEST_NAME mailserializerplugintest
 )
 ecm_add_test(mailserializertest.cpp
     ${CMAKE_SOURCE_DIR}/serializers/akonadi_serializer_mail.cpp
     ${CMAKE_BINARY_DIR}/serializers/akonadi_serializer_mail_debug.cpp
-    LINK_LIBRARIES KF5::AkonadiMime KF5::AkonadiCore KF5::AkonadiPrivate KF5::Mime Qt${QT_MAJOR_VERSION}::Test
+    LINK_LIBRARIES KF5::AkonadiMime KF5::AkonadiCore KF5::AkonadiPrivate KF5::Mime Qt::Test
     TEST_NAME mailserializertest
 )
 ecm_add_test(newmailnotifierattributetest.cpp newmailnotifierattributetest.h
-    LINK_LIBRARIES KF5::AkonadiMime KF5::AkonadiCore Qt${QT_MAJOR_VERSION}::Test
+    LINK_LIBRARIES KF5::AkonadiMime KF5::AkonadiCore Qt::Test
     TEST_NAME newmailnotifierattributetest
 )
 ecm_add_test(pop3resourceattributetest.cpp pop3resourceattributetest.h
-    LINK_LIBRARIES KF5::AkonadiMime KF5::AkonadiCore Qt${QT_MAJOR_VERSION}::Test
+    LINK_LIBRARIES KF5::AkonadiMime KF5::AkonadiCore Qt::Test
     TEST_NAME pop3resourceattributetest
 )
 ecm_add_test(addressattributetest.cpp addressattributetest.h
-    LINK_LIBRARIES KF5::AkonadiMime KF5::AkonadiCore Qt${QT_MAJOR_VERSION}::Test
+    LINK_LIBRARIES KF5::AkonadiMime KF5::AkonadiCore Qt::Test
     TEST_NAME addressattributetest
 )
 
 ecm_add_test(mdnstateattributetest.cpp mdnstateattributetest.h
-    LINK_LIBRARIES KF5::AkonadiMime KF5::AkonadiCore Qt${QT_MAJOR_VERSION}::Test
+    LINK_LIBRARIES KF5::AkonadiMime KF5::AkonadiCore Qt::Test
     TEST_NAME mdnstateattributetest
 )
 

autotests/benchmarker/CMakeLists.txt

@@ -24,11 +24,11 @@ add_executable(akonadi_benchmarker ${benchmarker_SRCS})
 target_link_libraries(akonadi_benchmarker
   KF5::AkonadiMime
   KF5::Mime
-  Qt${QT_MAJOR_VERSION}::Test
+  Qt::Test
   KF5::AkonadiCore
   KF5::I18n
-  Qt${QT_MAJOR_VERSION}::Widgets
-  Qt${QT_MAJOR_VERSION}::DBus
+  Qt::Widgets
+  Qt::DBus
 )
 
 install(TARGETS akonadi_benchmarker ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})

autotests/messagetests/CMakeLists.txt

@@ -8,7 +8,7 @@ macro(ADD_AKONADIMIME_TEST)
     add_test(NAME akonadimime-${_testName} COMMAND ${_testName})
     target_link_libraries(${_testName}
       KF5::Mime
-      Qt${QT_MAJOR_VERSION}::Test
+      Qt::Test
       KF5::AkonadiCore
       KF5::AkonadiMime
     )

tests/CMakeLists.txt

@@ -5,14 +5,14 @@ find_package(Qt${QT_MAJOR_VERSION} ${QT_REQUIRED_VERSION} CONFIG REQUIRED COMPON
 set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
 
 add_executable( requester foldersrequester.cpp foldersrequester.h )
-target_link_libraries( requester KF5::AkonadiMime KF5::I18n Qt${QT_MAJOR_VERSION}::Widgets )
+target_link_libraries( requester KF5::AkonadiMime KF5::I18n Qt::Widgets )
 
 # convenience macro to add akonadi demo application
 macro(add_akonadimime_demo _source)
   set(_test ${_source})
   get_filename_component(_name ${_source} NAME_WE)
   add_executable(${_name} ${_test})
-  target_link_libraries(${_name}  KF5AkonadiMime KF5::Mime KF5::AkonadiCore KF5::I18n Qt${QT_MAJOR_VERSION}::Widgets)
+  target_link_libraries(${_name}  KF5AkonadiMime KF5::Mime KF5::AkonadiCore KF5::I18n Qt::Widgets)
 endmacro()
 
 # demo applications