Use Qt:: directly

autotests/CMakeLists.txt

@@ -34,7 +34,7 @@ if (COMPILE_WITH_UNITY_CMAKE_SUPPORT)
     set_target_properties(kgapitest PROPERTIES UNITY_BUILD ON)
 endif()
 
-target_link_libraries(kgapitest Qt${QT_MAJOR_VERSION}::Core Qt${QT_MAJOR_VERSION}::Network Qt${QT_MAJOR_VERSION}::Gui Qt${QT_MAJOR_VERSION}::Test KPimGAPICore)
+target_link_libraries(kgapitest Qt::Core Qt::Network Qt::Gui Qt::Test KPimGAPICore)
 
 
 
@@ -96,8 +96,8 @@ add_libkgapi2_test(tasks tasklistmodifyjobtest)
 
 add_libkgapi2_test(drive aboutfetchjobtest)
 add_libkgapi2_test(drive changefetchjobtest)
-add_libkgapi2_test(drive filecopyjobtest Qt${QT_MAJOR_VERSION}::Gui)
-add_libkgapi2_test(drive filecreatejobtest Qt${QT_MAJOR_VERSION}::Gui)
+add_libkgapi2_test(drive filecopyjobtest Qt::Gui)
+add_libkgapi2_test(drive filecreatejobtest Qt::Gui)
 add_libkgapi2_test(drive filesearchquerytest)
 add_libkgapi2_test(drive drivescreatejobtest)
 add_libkgapi2_test(drive drivesdeletejobtest)

examples/contacts/CMakeLists.txt

@@ -8,7 +8,7 @@ target_sources(contacts-example PRIVATE
 
 target_link_libraries(contacts-example
         KF5::Contacts
-        Qt${QT_MAJOR_VERSION}::Widgets
+        Qt::Widgets
         KPimGAPICore
         KPimGAPIContacts
 )

examples/drives/CMakeLists.txt

@@ -7,8 +7,8 @@ target_sources(drives-example PRIVATE
 )
 
 target_link_libraries(drives-example
-        Qt${QT_MAJOR_VERSION}::Core
-        Qt${QT_MAJOR_VERSION}::Widgets
+        Qt::Core
+        Qt::Widgets
         KPimGAPICore
         KPimGAPIDrive
 )

examples/files/CMakeLists.txt

@@ -7,8 +7,8 @@ target_sources(files-example PRIVATE
 )
 
 target_link_libraries(files-example
-        Qt${QT_MAJOR_VERSION}::Widgets
-        Qt${QT_MAJOR_VERSION}::Core
+        Qt::Widgets
+        Qt::Core
         KPimGAPICore
         KPimGAPIDrive
 )

examples/permissions/CMakeLists.txt

@@ -7,8 +7,8 @@ target_sources(permissions-example PRIVATE
 )
 
 target_link_libraries(permissions-example
-        Qt${QT_MAJOR_VERSION}::Widgets
-        Qt${QT_MAJOR_VERSION}::Core
+        Qt::Widgets
+        Qt::Core
         KPimGAPICore
         KPimGAPIDrive
 )

examples/staticmaps/CMakeLists.txt

@@ -7,7 +7,7 @@ target_sources(staticmaps-example PRIVATE
 )
 
 target_link_libraries(staticmaps-example
-        Qt${QT_MAJOR_VERSION}::Widgets
+        Qt::Widgets
         KF5::Contacts
         KPimGapiStaticMaps
 )

examples/tasks/CMakeLists.txt

@@ -7,8 +7,8 @@ target_sources(tasks-example PRIVATE
 )
 
 target_link_libraries(tasks-example
-        Qt${QT_MAJOR_VERSION}::Widgets
-        Qt${QT_MAJOR_VERSION}::Core
+        Qt::Widgets
+        Qt::Core
         KPimGAPICore
         KPimGAPITasks
 )

examples/teamdrive/CMakeLists.txt

@@ -10,8 +10,8 @@ target_sources(teamdrive-example PRIVATE
 target_compile_options(teamdrive-example PRIVATE -Wno-deprecated-declarations)
 
 target_link_libraries(teamdrive-example
-        Qt${QT_MAJOR_VERSION}::Widgets
-        Qt${QT_MAJOR_VERSION}::Core
+        Qt::Widgets
+        Qt::Core
         KPimGAPICore
         KPimGAPIDrive
 )

src/blogger/CMakeLists.txt

@@ -83,7 +83,7 @@ target_link_libraries(KPimGAPIBlogger
 PUBLIC
     KPim::GAPICore
 PRIVATE
-    Qt${QT_MAJOR_VERSION}::Network
+    Qt::Network
 )
 
 set_target_properties(KPimGAPIBlogger PROPERTIES

src/calendar/CMakeLists.txt

@@ -67,9 +67,9 @@ target_link_libraries(KPimGAPICalendar
 PUBLIC
     KPim::GAPICore
     KF5::CalendarCore
-    Qt${QT_MAJOR_VERSION}::Gui
+    Qt::Gui
 PRIVATE
-    Qt${QT_MAJOR_VERSION}::Network
+    Qt::Network
 )
 
 set_target_properties(KPimGAPICalendar PROPERTIES

src/contacts/CMakeLists.txt

@@ -63,10 +63,10 @@ target_link_libraries(KPimGAPIContacts
 PUBLIC
     KPim::GAPICore
     KF5::Contacts
-    Qt${QT_MAJOR_VERSION}::Gui
+    Qt::Gui
 PRIVATE
-    Qt${QT_MAJOR_VERSION}::Xml
-    Qt${QT_MAJOR_VERSION}::Network
+    Qt::Xml
+    Qt::Network
 )
 
 set_target_properties(KPimGAPIContacts PROPERTIES
@@ -95,7 +95,7 @@ install(FILES
 
 ecm_generate_pri_file(BASE_NAME KGAPIContacts
     LIB_NAME KPimGAPIContacts
-    DEPS "KPim::GAPICore KF5::Contacts Qt${QT_MAJOR_VERSION}::Xml"
+    DEPS "KPim::GAPICore KF5::Contacts Qt::Xml"
     FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR "${KDE_INSTALL_INCLUDEDIR}/KPim/KGAPI"
 )
 

src/core/CMakeLists.txt

@@ -86,9 +86,9 @@ target_include_directories(KPimGAPICore
 
 target_link_libraries(KPimGAPICore
 PUBLIC
-    Qt${QT_MAJOR_VERSION}::Core
+    Qt::Core
 PRIVATE
-    Qt${QT_MAJOR_VERSION}::Network
+    Qt::Network
     KF5::Wallet
 )
 

src/drive/CMakeLists.txt

@@ -196,9 +196,9 @@ target_include_directories(KPimGAPIDrive
 target_link_libraries(KPimGAPIDrive
 PUBLIC
     KPim::GAPICore
-    Qt${QT_MAJOR_VERSION}::Gui
+    Qt::Gui
 PRIVATE
-    Qt${QT_MAJOR_VERSION}::Network
+    Qt::Network
 )
 
 set_target_properties(KPimGAPIDrive PROPERTIES

src/latitude/CMakeLists.txt

@@ -44,7 +44,7 @@ PUBLIC
     KPim::GAPICore
     KF5::Contacts
 PRIVATE
-    Qt${QT_MAJOR_VERSION}::Network
+    Qt::Network
 )
 
 set_target_properties(KPimGAPILatitude PROPERTIES

src/staticmaps/CMakeLists.txt

@@ -34,9 +34,9 @@ target_link_libraries(KPimGAPIMaps
 PUBLIC
     KPim::GAPICore
     KF5::Contacts
-    Qt${QT_MAJOR_VERSION}::Gui
+    Qt::Gui
 PRIVATE
-    Qt${QT_MAJOR_VERSION}::Network
+    Qt::Network
 )
 
 set_target_properties(KPimGAPIMaps PROPERTIES

src/tasks/CMakeLists.txt

@@ -64,7 +64,7 @@ PUBLIC
     KPim::GAPICore
     KF5::CalendarCore
 PRIVATE
-    Qt${QT_MAJOR_VERSION}::Network
+    Qt::Network
 )
 
 set_target_properties(KPimGAPITasks PROPERTIES