Use Qt:: directly

agent/CMakeLists.txt

@@ -53,7 +53,7 @@ if (COMPILE_WITH_UNITY_CMAKE_SUPPORT)
 endif()
 
 target_link_libraries(akonadi_indexing_agent
-    Qt${QT_MAJOR_VERSION}::Core
+    Qt::Core
     KF5::AkonadiCore
     KF5::AkonadiMime
     KF5::Mime
@@ -65,7 +65,7 @@ target_link_libraries(akonadi_indexing_agent
     KF5::Codecs
     KF5::I18n
     KF5::ConfigCore
-    Qt${QT_MAJOR_VERSION}::Widgets
+    Qt::Widgets
 )
 
 install(TARGETS akonadi_indexing_agent ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})

agent/autotests/CMakeLists.txt

@@ -18,7 +18,7 @@ set(indexer_SRCS
 )
 
 set(indexer_LIBS
-    Qt${QT_MAJOR_VERSION}::Test
+    Qt::Test
     KF5::AkonadiCore
     KF5::AkonadiMime
     KF5::AkonadiAgentBase
@@ -72,8 +72,8 @@ target_link_libraries(collectionquerytest
     KF5::AkonadiSearchPIM
     KF5::AkonadiAgentBase
     KF5::ConfigCore
-    Qt${QT_MAJOR_VERSION}::Widgets
-    Qt${QT_MAJOR_VERSION}::DBus
+    Qt::Widgets
+    Qt::DBus
 )
 endif()
 endif()

agent/tests/CMakeLists.txt

@@ -5,12 +5,12 @@ include_directories(
 add_executable(emailindexer emailtest.cpp ../emailindexer.cpp ../abstractindexer.cpp ../akonadi_indexer_agent_debug.cpp ../stringutil.cpp)
 
 target_link_libraries(emailindexer
-  Qt${QT_MAJOR_VERSION}::Test
+  Qt::Test
   KF5::AkonadiCore
   KF5::AkonadiMime
   KF5::Mime
   KF5::AkonadiSearchPIM
   KF5::AkonadiSearchXapian
   KF5::Codecs
-  Qt${QT_MAJOR_VERSION}::Widgets
+  Qt::Widgets
 )

akonadiplugin/autotests/CMakeLists.txt

@@ -32,7 +32,7 @@ add_test( NAME searchplugintest COMMAND searchplugintest )
 ecm_mark_as_test(searchplugintest)
 
 target_link_libraries(searchplugintest
-    Qt${QT_MAJOR_VERSION}::Test
+    Qt::Test
     KF5::AkonadiCore
     KF5::AkonadiMime
     KF5::Mime

core/CMakeLists.txt

@@ -28,7 +28,7 @@ endif()
 
 target_link_libraries(KF5AkonadiSearchCore
     PUBLIC
-    Qt${QT_MAJOR_VERSION}::Core
+    Qt::Core
 )
 
 set_target_properties(KF5AkonadiSearchCore PROPERTIES

debug/CMakeLists.txt

@@ -26,7 +26,7 @@ generate_export_header(KF5AkonadiSearchDebug BASE_NAME AKONADI_SEARCH_DEBUG EXPO
 
 target_link_libraries(KF5AkonadiSearchDebug
     PRIVATE
-    Qt${QT_MAJOR_VERSION}::Widgets
+    Qt::Widgets
     KF5::I18n
     KF5::AkonadiCore
     KF5::WidgetsAddons

debug/autotests/CMakeLists.txt

@@ -7,7 +7,7 @@ macro(add_akonadisearchdebug_unittest _source)
     ecm_add_test(${_source} ${_name}.h
         TEST_NAME ${_name}
         NAME_PREFIX "akonadisearchdebug-"
-        LINK_LIBRARIES Qt${QT_MAJOR_VERSION}::Test Qt${QT_MAJOR_VERSION}::Gui KF5::Completion KF5::CoreAddons KF5::AkonadiSearchDebug KF5::AkonadiCore
+        LINK_LIBRARIES Qt::Test Qt::Gui KF5::Completion KF5::CoreAddons KF5::AkonadiSearchDebug KF5::AkonadiCore
         GUI
     )
 endmacro ()

debug/tests/CMakeLists.txt

@@ -5,9 +5,9 @@ include_directories(
 add_executable(akonadisearchdebug_dialog_gui akonadisearchdebug_dialog_gui.cpp)
 ecm_mark_as_test(akonadisearchdebug_dialog_gui)
 target_link_libraries(akonadisearchdebug_dialog_gui
-  Qt${QT_MAJOR_VERSION}::Core
-  Qt${QT_MAJOR_VERSION}::Gui
-  Qt${QT_MAJOR_VERSION}::Widgets
+  Qt::Core
+  Qt::Gui
+  Qt::Widgets
   KF5::AkonadiCore
   KF5::I18n
   KF5::AkonadiSearchDebug

lib/CMakeLists.txt

@@ -57,7 +57,7 @@ generate_export_header(KF5AkonadiSearchPIM BASE_NAME AKONADI_SEARCH_PIM EXPORT_F
 
 target_link_libraries(KF5AkonadiSearchPIM
     PUBLIC
-    Qt${QT_MAJOR_VERSION}::Core
+    Qt::Core
 
     PRIVATE
     KF5::AkonadiCore

lib/tests/CMakeLists.txt

@@ -5,7 +5,7 @@ include_directories(
 macro(add_search_test name)
     ecm_add_test("${name}test.cpp"
                 TEST_NAME "${test}"
-                LINK_LIBRARIES Qt${QT_MAJOR_VERSION}::Core KF5::AkonadiCore KF5::AkonadiMime KF5::Mime KF5::Contacts KF5::AkonadiSearchPIM
+                LINK_LIBRARIES Qt::Core KF5::AkonadiCore KF5::AkonadiMime KF5::Mime KF5::Contacts KF5::AkonadiSearchPIM
     )
 endmacro()
 

runner/CMakeLists.txt

@@ -33,7 +33,7 @@ target_sources(kcm_krunner_pimcontacts PRIVATE
 )
 
 target_link_libraries(kcm_krunner_pimcontacts
-    Qt${QT_MAJOR_VERSION}::Gui
+    Qt::Gui
     KF5::KCMUtils
     KF5::I18n
 )

search/calendar/CMakeLists.txt

 add_library(calendarsearchstore MODULE )
 target_sources(calendarsearchstore PRIVATE calendarsearchstore.cpp ../pimsearchstore.cpp calendarsearchstore.h ../pimsearchstore.h)
 target_link_libraries(calendarsearchstore
-    Qt${QT_MAJOR_VERSION}::Core
+    Qt::Core
     KF5::AkonadiCore
     ${XAPIAN_LIBRARIES}
     KF5AkonadiSearchCore

search/contact/CMakeLists.txt

 add_library(contactsearchstore MODULE )
 target_sources(contactsearchstore PRIVATE contactsearchstore.cpp ../pimsearchstore.cpp contactsearchstore.h ../pimsearchstore.h)
 target_link_libraries(contactsearchstore
-    Qt${QT_MAJOR_VERSION}::Core
+    Qt::Core
     KF5::AkonadiCore
     ${XAPIAN_LIBRARIES}
     KF5AkonadiSearchCore

search/email/CMakeLists.txt

 add_library(emailsearchstore MODULE )
 target_sources(emailsearchstore PRIVATE agepostingsource.cpp emailsearchstore.cpp ../pimsearchstore.cpp agepostingsource.h emailsearchstore.h ../pimsearchstore.h)
 target_link_libraries(emailsearchstore
-    Qt${QT_MAJOR_VERSION}::Core
+    Qt::Core
     KF5::AkonadiCore
     ${XAPIAN_LIBRARIES}
     KF5AkonadiSearchCore

search/note/CMakeLists.txt

 add_library(notesearchstore MODULE)
 target_sources(notesearchstore PRIVATE notesearchstore.cpp ../pimsearchstore.cpp notesearchstore.h ../pimsearchstore.h)
 target_link_libraries(notesearchstore
-    Qt${QT_MAJOR_VERSION}::Core
+    Qt::Core
     KF5::AkonadiCore
     ${XAPIAN_LIBRARIES}
     KF5AkonadiSearchCore

xapian/CMakeLists.txt

@@ -31,7 +31,7 @@ endif()
 
 
 target_link_libraries(KF5AkonadiSearchXapian PUBLIC
-    Qt${QT_MAJOR_VERSION}::Core
+    Qt::Core
     KF5::AkonadiSearchCore
     ${XAPIAN_LIBRARIES}
 )

xapian/autotests/CMakeLists.txt

 ecm_add_test(termgeneratortest.cpp termgeneratortest.h
     TEST_NAME "termgeneratortest"
-    LINK_LIBRARIES Qt${QT_MAJOR_VERSION}::Test KF5::AkonadiSearchXapian
+    LINK_LIBRARIES Qt::Test KF5::AkonadiSearchXapian
 )
 
 ecm_add_test(queryparsertest.cpp queryparsertest.h
     TEST_NAME "queryparsertest"
-    LINK_LIBRARIES Qt${QT_MAJOR_VERSION}::Test KF5::AkonadiSearchXapian
+    LINK_LIBRARIES Qt::Test KF5::AkonadiSearchXapian
 )

xapian/tests/CMakeLists.txt

 add_executable(writeiotest writeiotest.cpp)
 target_link_libraries(writeiotest
-    Qt${QT_MAJOR_VERSION}::Core
+    Qt::Core
     KF5::AkonadiSearchXapian
 )
 
 add_executable(memorytest memorytest.cpp)
 target_link_libraries(memorytest
-    Qt${QT_MAJOR_VERSION}::Core
+    Qt::Core
     KF5::AkonadiSearchXapian
 )