Use Qt:: directly

agents/migration/autotests/CMakeLists.txt

@@ -7,6 +7,6 @@ add_executable(schedulertest schedulertest.cpp ../migrationscheduler.cpp ../migr
 target_link_libraries(schedulertest
     gidmigration
     KF5::AkonadiCore
-    Qt${QT_MAJOR_VERSION}::Test
+    Qt::Test
 )
 add_test(NAME schedulertest COMMAND schedulertest)

agents/newmailnotifier/CMakeLists.txt

@@ -51,7 +51,7 @@ target_link_libraries( akonadi_newmailnotifier_agent
 
 if(Qt${QT_MAJOR_VERSION}TextToSpeech_FOUND)
     target_link_libraries( akonadi_newmailnotifier_agent
-      Qt${QT_MAJOR_VERSION}::TextToSpeech
+      Qt::TextToSpeech
     )
 endif()
 
@@ -84,7 +84,7 @@ target_sources(newmailnotifierconfig PRIVATE
 target_link_libraries(newmailnotifierconfig
     KF5::AkonadiCore
     KF5::AkonadiMime
-    Qt${QT_MAJOR_VERSION}::Widgets
+    Qt::Widgets
     KF5::NotifyConfig
     KF5::ConfigGui
     KF5::I18n

agents/newmailnotifier/tests/CMakeLists.txt

@@ -6,7 +6,7 @@ set(newmailnotifieragent_common_SRCS)
 set(newmailnotifierselectcollectionwidget_SRCS newmailnotifierselectcollectionwidget_test.cpp ../newmailnotifierselectcollectionwidget.cpp ${newmailnotifieragent_common_SRCS})
 add_executable(newmailnotifierselectcollectionwidgettest ${newmailnotifierselectcollectionwidget_SRCS})
 target_link_libraries(newmailnotifierselectcollectionwidgettest
-    Qt${QT_MAJOR_VERSION}::Widgets
+    Qt::Widgets
     KF5::I18n
     KF5::AkonadiCore
     KF5::Mime

kioslave/akonadi/CMakeLists.txt

@@ -13,9 +13,9 @@ target_link_libraries(kio_akonadi
                       KF5::KIOCore 
                       KF5::AkonadiCore 
                       KF5::I18n
-                      Qt${QT_MAJOR_VERSION}::DBus
-                      Qt${QT_MAJOR_VERSION}::Widgets
-                      Qt${QT_MAJOR_VERSION}::Network
+                      Qt::DBus
+                      Qt::Widgets
+                      Qt::Network
                       )
 set_target_properties(kio_akonadi PROPERTIES OUTPUT_NAME "akonadi")
 

migration/CMakeLists.txt

@@ -31,7 +31,7 @@ target_link_libraries(migrationshared
     KF5::AkonadiCore
     KF5::ConfigCore
     KF5::I18n
-    Qt${QT_MAJOR_VERSION}::Widgets
+    Qt::Widgets
 )
 
 

migration/googlegroupware/CMakeLists.txt

@@ -25,6 +25,6 @@ target_link_libraries(googlegroupwaremigration
     KF5::ConfigGui
     KF5::I18n
     KF5::Wallet
-    Qt${QT_MAJOR_VERSION}::DBus
+    Qt::DBus
     migrationshared
 )

resources/CMakeLists.txt

@@ -70,7 +70,7 @@ add_subdirectory( vcarddir )
 add_subdirectory( icaldir )
 add_subdirectory( vcard )
 add_subdirectory( folderarchivesettings )
-if (TARGET Qt${QT_MAJOR_VERSION}::WebEngineWidgets)
+if (TARGET Qt::WebEngineWidgets)
     add_subdirectory( tomboynotes )
     add_subdirectory( ews )
 endif()

resources/dav/resource/CMakeLists.txt

@@ -91,7 +91,7 @@ target_link_libraries(akonadi_davgroupware_resource
     KF5::WindowSystem
     KF5::DAV
     KF5::Service
-    Qt${QT_MAJOR_VERSION}::Xml
+    Qt::Xml
     )
 
 install(TARGETS akonadi_davgroupware_resource ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})

resources/etesync/CMakeLists.txt

@@ -51,7 +51,7 @@ if (COMPILE_WITH_UNITY_CMAKE_SUPPORT)
 endif()
 target_link_libraries(akonadi_etesync_resource
     ${ETEBASE_LIBRARIES}
-    Qt${QT_MAJOR_VERSION}::DBus
+    Qt::DBus
     KF5::AkonadiAgentBase
     KF5::ConfigCore
     KF5::Contacts

resources/ews/ewsclient/CMakeLists.txt

@@ -92,7 +92,7 @@ set(EWSCLIENT_SRCS
 
     )
 
-if (TARGET Qt${QT_MAJOR_VERSION}::NetworkAuth)
+if (TARGET Qt::NetworkAuth)
     list(APPEND EWSCLIENT_SRCS
         auth/ewsoauth.cpp
         auth/ewsoauth.h)
@@ -139,7 +139,7 @@ ecm_qt_declare_logging_category(EWSCLIENT_SRCS
 
 add_library(ewsclient STATIC ${EWSCLIENT_SRCS})
 target_link_libraries(ewsclient
-    Qt${QT_MAJOR_VERSION}::Network
+    Qt::Network
     KF5::KIOCore
     KF5::KIOFileWidgets
     KF5::KIOWidgets
@@ -148,10 +148,10 @@ target_link_libraries(ewsclient
     KF5::Mime
     KF5::CalendarCore)
 
-if (TARGET Qt${QT_MAJOR_VERSION}::NetworkAuth)
+if (TARGET Qt::NetworkAuth)
     target_link_libraries(ewsclient
-        Qt${QT_MAJOR_VERSION}::NetworkAuth
-        Qt${QT_MAJOR_VERSION}::WebEngineWidgets)
+        Qt::NetworkAuth
+        Qt::WebEngineWidgets)
 endif ()
 
 if (Qca-qt${QT_MAJOR_VERSION}_FOUND)

resources/ews/test/CMakeLists.txt

@@ -24,9 +24,9 @@ add_library(isolatedtestcommon STATIC ${isolatestestcommon_SRCS})
 target_link_libraries(isolatedtestcommon
   KF5::AkonadiCore
   KF5::AkonadiMime
-  Qt${QT_MAJOR_VERSION}::Core
-  Qt${QT_MAJOR_VERSION}::Network
-  Qt${QT_MAJOR_VERSION}::Test
+  Qt::Core
+  Qt::Network
+  Qt::Test
   fakeewsserver
 )
 

resources/ews/test/fakeserver/CMakeLists.txt

@@ -13,6 +13,6 @@ set(fakeewsserver_SRCS
 add_library(fakeewsserver ${fakeewsserver_SRCS})
 
 generate_export_header(fakeewsserver BASE_NAME fakeewsserver)
-target_link_libraries(fakeewsserver Qt${QT_MAJOR_VERSION}::Core Qt${QT_MAJOR_VERSION}::Network Qt${QT_MAJOR_VERSION}::XmlPatterns)
+target_link_libraries(fakeewsserver Qt::Core Qt::Network Qt::XmlPatterns)
 
 add_subdirectory(test)

resources/ews/test/fakeserver/test/CMakeLists.txt

@@ -7,7 +7,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..)
 
 macro(akonadi_fakeserver_add_test tname)
   add_executable(${tname} ${tname}.cpp)
-  target_link_libraries(${tname} Qt${QT_MAJOR_VERSION}::Test fakeewsserver)
+  target_link_libraries(${tname} Qt::Test fakeewsserver)
   add_test(NAME ${tname} COMMAND ${tname})
 endmacro(akonadi_fakeserver_add_test tname)
 

resources/ews/test/unittests/CMakeLists.txt

@@ -6,11 +6,11 @@
 kde_enable_exceptions()
 
 add_library(uttesthelpers STATIC faketransferjob.cpp)
-target_link_libraries(uttesthelpers Qt${QT_MAJOR_VERSION}::Core KF5::KIOCore)
+target_link_libraries(uttesthelpers Qt::Core KF5::KIOCore)
 
 macro(akonadi_ews_add_ut_advanced utname extra_SRCS)
   add_executable(${utname} ${utname}.cpp ${extra_SRCS})
-  target_link_libraries(${utname} Qt${QT_MAJOR_VERSION}::Test uttesthelpers)
+  target_link_libraries(${utname} Qt::Test uttesthelpers)
   add_test(NAME ${utname} COMMAND ${utname})
 endmacro(akonadi_ews_add_ut_advanced utname)
 
@@ -38,16 +38,16 @@ target_link_libraries(ewssettings_ut
   )
 target_compile_definitions(ewssettings_ut PUBLIC -DEWSSETTINGS_UNITTEST)
 
-if (TARGET Qt${QT_MAJOR_VERSION}::NetworkAuth)
+if (TARGET Qt::NetworkAuth)
   set(ewsoauth_ut_SRCS
     ewsoauth_ut_mock.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/../../ewsclient/auth/ewsabstractauth.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/../../ewsclient/auth/ewsoauth.cpp)
   akonadi_ews_add_ut_advanced(ewsoauth_ut "${ewsoauth_ut_SRCS}")
   target_link_libraries(ewsoauth_ut
-    Qt${QT_MAJOR_VERSION}::Widgets
+    Qt::Widgets
     KF5::I18n
-    Qt${QT_MAJOR_VERSION}::WebEngineWidgets
+    Qt::WebEngineWidgets
     )
   target_compile_definitions(ewsoauth_ut PUBLIC -DEWSOAUTH_UNITTEST)
 endif ()

resources/facebook/CMakeLists.txt

@@ -23,7 +23,7 @@ target_link_libraries(facebookresourcelib
     KF5::I18n
     KF5::ConfigGui
     KF5::CalendarCore
-    Qt${QT_MAJOR_VERSION}::WebEngineWidgets
+    Qt::WebEngineWidgets
     KF5::Wallet
     KF5::Codecs
 )
@@ -38,7 +38,7 @@ target_link_libraries(akonadi_facebook_resource
     KF5::I18n
     KF5::Wallet
     KF5::Codecs
-    Qt${QT_MAJOR_VERSION}::WebEngineWidgets
+    Qt::WebEngineWidgets
     KF5::KIOCore
 )
 

resources/folderarchivesettings/CMakeLists.txt

@@ -23,7 +23,7 @@ PRIVATE
                       KF5::AkonadiWidgets
                       KF5::ConfigCore
                       KF5::I18n
-                      Qt${QT_MAJOR_VERSION}::DBus
+                      Qt::DBus
 )
 
 set_target_properties(folderarchivesettings PROPERTIES VERSION ${KDEPIMRUNTIME_LIB_VERSION} SOVERSION ${KDEPIMRUNTIME_LIB_SOVERSION} )

resources/folderarchivesettings/autotests/CMakeLists.txt

@@ -7,7 +7,7 @@ macro( folderarchive_kmail _source )
   add_test(NAME ${_name} COMMAND ${_name} )
   ecm_mark_as_test(folderararchive-${_name})
 
-  target_link_libraries( ${_name} Qt${QT_MAJOR_VERSION}::Test Qt${QT_MAJOR_VERSION}::Core  KF5::AkonadiCore KF5::ConfigCore)
+  target_link_libraries( ${_name} Qt::Test Qt::Core  KF5::AkonadiCore KF5::ConfigCore)
 endmacro()
 
 folderarchive_kmail(folderarchiveaccountinfotest.cpp)

resources/imap/CMakeLists.txt

@@ -108,8 +108,8 @@ qt_add_dbus_adaptor( imapresource_LIB_SRCS
 add_library(imapresource STATIC ${imapresource_LIB_SRCS})
 
 target_link_libraries(imapresource
-    Qt${QT_MAJOR_VERSION}::DBus
-    Qt${QT_MAJOR_VERSION}::Network
+    Qt::DBus
+    Qt::Network
     KF5::AkonadiCore
     KF5::IMAP
     KF5::MailTransport
@@ -162,7 +162,7 @@ if( APPLE )
 endif ()
 
 target_link_libraries(akonadi_imap_resource
-    Qt${QT_MAJOR_VERSION}::DBus
+    Qt::DBus
     KF5::AkonadiCore
     KF5::IMAP
     akonadi-singlefileresource

resources/imap/autotests/CMakeLists.txt

@@ -19,7 +19,7 @@ MACRO(IMAP_RESOURCE_UNIT_TESTS)
     ecm_mark_as_test(imap-${_testname})
 
     target_link_libraries(${_testname}
-      KF5::IMAP KF5::kimaptest Qt${QT_MAJOR_VERSION}::Gui Qt${QT_MAJOR_VERSION}::Core Qt${QT_MAJOR_VERSION}::Test imapresource akonadi-singlefileresource)
+      KF5::IMAP KF5::kimaptest Qt::Gui Qt::Core Qt::Test imapresource akonadi-singlefileresource)
     add_definitions(-DTEST_DATA="\\"${CMAKE_CURRENT_SOURCE_DIR}\\"")
   ENDFOREACH(_testname)
 ENDMACRO(IMAP_RESOURCE_UNIT_TESTS)

resources/imap/tests/CMakeLists.txt

@@ -11,5 +11,5 @@ set(testsubscriptiondialog_SRCS
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_BINARY_DIR}/..)
 add_executable(testsubscriptiondialog ${testsubscriptiondialog_SRCS})
 
-target_link_libraries(testsubscriptiondialog KF5::KIOCore KF5::IMAP KF5::Mime KF5::ItemModels Qt${QT_MAJOR_VERSION}::Widgets KF5::I18n KF5::KIOWidgets KF5::AkonadiCore KF5::MailTransport)
+target_link_libraries(testsubscriptiondialog KF5::KIOCore KF5::IMAP KF5::Mime KF5::ItemModels Qt::Widgets KF5::I18n KF5::KIOWidgets KF5::AkonadiCore KF5::MailTransport)