GIT_SILENT: Use versionless Qt cmake target. This makes it easier to build against both Qt5 and Qt6

src/pimcommon/CMakeLists.txt

@@ -174,7 +174,7 @@ add_library(KF5::PimCommon ALIAS KF5PimCommon)
 
 target_link_libraries(KF5PimCommon
     PUBLIC
-    Qt5::Network
+    Qt::Network
     KF5::KIOCore
     KF5::ConfigWidgets
     PRIVATE
@@ -186,7 +186,7 @@ target_link_libraries(KF5PimCommon
     KF5::XmlGui
     KF5::PimTextEdit
     KF5::KIOWidgets
-    Qt5::PrintSupport
+    Qt::PrintSupport
     KF5::Purpose
     KF5::PurposeWidgets
     )

src/pimcommon/autocorrection/autotests/CMakeLists.txt

@@ -7,7 +7,7 @@ macro(add_pimcommon_autocorrect_unittest _source)
   add_test(NAME ${_name} COMMAND ${_name} )
   set_tests_properties(${_name} PROPERTIES ENVIRONMENT "QT_HASH_SEED=0")
   ecm_mark_as_test(pimcommon-autocorrection-${_name})
-  target_link_libraries(${_name}  Qt5::Test KF5::PimCommon KF5::PimTextEdit)
+  target_link_libraries(${_name}  Qt::Test KF5::PimCommon KF5::PimTextEdit)
 endmacro()
 
 add_pimcommon_autocorrect_unittest(autocorrectiontest.cpp)

src/pimcommon/autotests/CMakeLists.txt

@@ -2,7 +2,7 @@ macro(add_pimcommon_regularexpression_unittest _name)
     ecm_add_test(${ARGN}
         TEST_NAME ${_name}
         NAME_PREFIX "pimcommon-regularexpression-"
-        LINK_LIBRARIES Qt5::Test Qt5::Gui KF5::PimCommon
+        LINK_LIBRARIES Qt::Test Qt::Gui KF5::PimCommon
     )
 endmacro()
 

src/pimcommon/configureplugins/autotests/CMakeLists.txt

@@ -2,7 +2,7 @@ set( pimcommon_configureplugins_source_SRCS configurepluginswidgettest.cpp )
 add_executable( configurepluginswidgettest ${pimcommon_configureplugins_source_SRCS} )
 add_test(NAME configurepluginswidgettest COMMAND configurepluginswidgettest )
 ecm_mark_as_test(kmail-configurepluginswidgettest)
-target_link_libraries( configurepluginswidgettest Qt5::Test KF5::I18n Qt5::Widgets
+target_link_libraries( configurepluginswidgettest Qt::Test KF5::I18n Qt::Widgets
     KF5::ConfigCore KF5::TextWidgets KF5::WidgetsAddons KF5::PimCommon)
 
 
@@ -10,5 +10,5 @@ set( pimcommon_configurepluginslist_source_SRCS configurepluginslistwidgettest.c
 add_executable( configurepluginslistwidgettest ${pimcommon_configurepluginslist_source_SRCS} )
 add_test(NAME configurepluginslistwidgettest COMMAND configurepluginslistwidgettest )
 ecm_mark_as_test(kmail-configurepluginslistwidgettest)
-target_link_libraries( configurepluginslistwidgettest Qt5::Test KF5::I18n Qt5::Widgets
+target_link_libraries( configurepluginslistwidgettest Qt::Test KF5::I18n Qt::Widgets
     KF5::ConfigCore KF5::TextWidgets KF5::WidgetsAddons KF5::PimCommon)

src/pimcommon/customtools/autotests/CMakeLists.txt

 ecm_add_test(customtoolswidgetngtest.cpp
     TEST_NAME customtoolswidgetngtest
     NAME_PREFIX pimcommon-
-    LINK_LIBRARIES Qt5::Test Qt5::Gui KF5::PimCommon KF5::XmlGui
+    LINK_LIBRARIES Qt::Test Qt::Gui KF5::PimCommon KF5::XmlGui
 )
 

src/pimcommon/genericplugins/autotests/CMakeLists.txt

 ecm_add_test(genericpluginmanagertest.cpp
     NAME_PREFIX "pimcommon-genericplugins-"
-    LINK_LIBRARIES Qt5::Test KF5::PimCommonAkonadi
+    LINK_LIBRARIES Qt::Test KF5::PimCommonAkonadi
 )
 
 
 ecm_add_test(actiontypetest.cpp
     NAME_PREFIX "pimcommon-genericplugins-"
-    LINK_LIBRARIES Qt5::Test KF5::PimCommonAkonadi
+    LINK_LIBRARIES Qt::Test KF5::PimCommonAkonadi
 )
 
 ecm_add_test(pluginutiltest.cpp
     NAME_PREFIX "pimcommon-genericplugins-"
-    LINK_LIBRARIES Qt5::Test KF5::PimCommonAkonadi
+    LINK_LIBRARIES Qt::Test KF5::PimCommonAkonadi
 )
 

src/pimcommon/logactivities/autotests/CMakeLists.txt

 ecm_add_test(logactivitiesmanagertest.cpp
     NAME_PREFIX "pimcommon-logactivities-"
-    LINK_LIBRARIES Qt5::Test KF5::PimCommon KF5::PimTextEdit
+    LINK_LIBRARIES Qt::Test KF5::PimCommon KF5::PimTextEdit
 )
 
 ecm_add_test(logactivitieswidgettest.cpp
     NAME_PREFIX "pimcommon-logactivities-"
-    LINK_LIBRARIES Qt5::Test KF5::PimCommon KF5::PimTextEdit
+    LINK_LIBRARIES Qt::Test KF5::PimCommon KF5::PimTextEdit
 )
 
 ecm_add_test(logactivitiesdialogtest.cpp
     NAME_PREFIX "pimcommon-logactivities-"
-    LINK_LIBRARIES Qt5::Test KF5::PimCommon KF5::PimTextEdit
+    LINK_LIBRARIES Qt::Test KF5::PimCommon KF5::PimTextEdit
 )

src/pimcommon/migration/autotests/CMakeLists.txt

@@ -3,7 +3,7 @@ add_definitions(-DMIGRATION_DATA_DIR="${CMAKE_CURRENT_SOURCE_DIR}/data")
 macro(add_pimcommon_migration_unittest _source)
     ecm_add_test(${_source}
         NAME_PREFIX "pimcommon-migration-"
-        LINK_LIBRARIES Qt5::Test KF5::CoreAddons KF5::ConfigCore KF5::PimCommon
+        LINK_LIBRARIES Qt::Test KF5::CoreAddons KF5::ConfigCore KF5::PimCommon
     )
 endmacro()
 

src/pimcommon/misc/autotests/CMakeLists.txt

@@ -2,8 +2,8 @@ macro(add_pimcommon_misc_unittest _name)
     ecm_add_test(${ARGN}
         TEST_NAME ${_name}
         NAME_PREFIX "pimcommon-misc-"
-        LINK_LIBRARIES Qt5::Test
-        Qt5::Widgets
+        LINK_LIBRARIES Qt::Test
+        Qt::Widgets
 	KF5::PimCommon
     )
 endmacro()

src/pimcommon/shareserviceurl/autotests/CMakeLists.txt

 ecm_add_test(shareserviceurlmanagertest.cpp
     NAME_PREFIX "pimcommon-shareserviceurl-"
-    LINK_LIBRARIES Qt5::Test KF5::PimCommon
+    LINK_LIBRARIES Qt::Test KF5::PimCommon
 )

src/pimcommon/translator/autotests/CMakeLists.txt

 ecm_add_test(translatortest.cpp
     NAME_PREFIX "pimcommon-translator-"
-    LINK_LIBRARIES KF5::PimCommon Qt5::Test KF5::XmlGui KF5::PimTextEdit
+    LINK_LIBRARIES KF5::PimCommon Qt::Test KF5::XmlGui KF5::PimTextEdit
 )

src/pimcommon/widgets/autotests/CMakeLists.txt

 ecm_add_test(kactionmenuchangecasetest.cpp
     TEST_NAME kactionmenuchangecasetest
     NAME_PREFIX pimcommon-widget
-    LINK_LIBRARIES Qt5::Test Qt5::Gui KF5::WidgetsAddons KF5::I18n KF5::XmlGui KF5::PimCommon
+    LINK_LIBRARIES Qt::Test Qt::Gui KF5::WidgetsAddons KF5::I18n KF5::XmlGui KF5::PimCommon
 )
 
 ecm_add_test(lineeditwithcompleterngtest.cpp
     TEST_NAME lineeditwithcompleterngtest
     NAME_PREFIX pimcommon-widget
-    LINK_LIBRARIES Qt5::Test Qt5::Gui KF5::WidgetsAddons KF5::I18n KF5::PimCommon
+    LINK_LIBRARIES Qt::Test Qt::Gui KF5::WidgetsAddons KF5::I18n KF5::PimCommon
 )
 
 ecm_add_test(purposemenuwidgettest.cpp
     TEST_NAME purposemenuwidgettest
     NAME_PREFIX pimcommon-widget
-    LINK_LIBRARIES Qt5::Test Qt5::Gui KF5::WidgetsAddons KF5::I18n KF5::PimCommon KF5::Purpose KF5::PurposeWidgets
+    LINK_LIBRARIES Qt::Test Qt::Gui KF5::WidgetsAddons KF5::I18n KF5::PimCommon KF5::Purpose KF5::PurposeWidgets
     )

src/pimcommonakonadi/acl/autotests/CMakeLists.txt

 ecm_add_test(imapaclattributetest.cpp
     TEST_NAME imapaclattributetest
     NAME_PREFIX "pimcommon-acl-"
-    LINK_LIBRARIES Qt5::Test Qt5::Gui KF5::AkonadiCore KF5::IMAP KF5::PimCommonAkonadi
+    LINK_LIBRARIES Qt::Test Qt::Gui KF5::AkonadiCore KF5::IMAP KF5::PimCommonAkonadi
     GUI
 )
 
 ecm_add_test(collectionaclwidgettest.cpp ../collectionaclwidget.cpp
     TEST_NAME collectionaclwidgettest
     NAME_PREFIX "pimcommon-acl-"
-    LINK_LIBRARIES Qt5::Test Qt5::Gui KF5::AkonadiCore KF5::IMAP KF5::PimCommonAkonadi KF5::I18n
+    LINK_LIBRARIES Qt::Test Qt::Gui KF5::AkonadiCore KF5::IMAP KF5::PimCommonAkonadi KF5::I18n
 )

src/pimcommonakonadi/addressline/autotests/CMakeLists.txt

@@ -2,11 +2,11 @@ macro(add_pimcommonakonadi_addressline_unittest _name)
     ecm_add_test(${ARGN}
         TEST_NAME ${_name}
         NAME_PREFIX "pimcommon-addressline-"
-        LINK_LIBRARIES Qt5::Test
+        LINK_LIBRARIES Qt::Test
         KF5::Contacts
-        Qt5::Widgets
+        Qt::Widgets
         KF5::PimCommonAkonadi
-        Qt5::DBus
+        Qt::DBus
         KF5::Codecs
         KF5::ConfigCore
         KF5::Completion

src/pimcommonakonadi/addressline/blacklistbaloocompletion/autotests/CMakeLists.txt

@@ -2,7 +2,7 @@ macro(add_libkdepim_blacklistbaloocompletion_unittest _name)
     ecm_add_test(${ARGN}
         TEST_NAME ${_name}
         NAME_PREFIX "pimcommon-addessline-blaclistbaloocompletion-"
-        LINK_LIBRARIES Qt5::Test KF5::PimCommonAkonadi KF5::WidgetsAddons KF5::Completion KF5::I18n KF5::ConfigCore KF5::ItemViews KF5::Codecs
+        LINK_LIBRARIES Qt::Test KF5::PimCommonAkonadi KF5::WidgetsAddons KF5::Completion KF5::I18n KF5::ConfigCore KF5::ItemViews KF5::Codecs
     )
 endmacro()
 

src/pimcommonakonadi/collectionpage/autotests/CMakeLists.txt

@@ -2,7 +2,7 @@ macro(add_pimcommon_collectionpage_test _name)
     ecm_add_test(${ARGN}
         TEST_NAME ${_name}
         NAME_PREFIX "pimcommon-collectionpage-"
-        LINK_LIBRARIES Qt5::Test Qt5::Gui KF5::AkonadiCore KF5::PimCommonAkonadi
+        LINK_LIBRARIES Qt::Test Qt::Gui KF5::AkonadiCore KF5::PimCommonAkonadi
     )
 endmacro()
 

src/pimcommonakonadi/ldap/tests/CMakeLists.txt

@@ -2,5 +2,5 @@
 set(testldapsearchdialog_SRCS ldapsearchdialog_gui.cpp)
 
 add_executable(ldapsearchdialog_gui ${testldapsearchdialog_SRCS})
-target_link_libraries(ldapsearchdialog_gui KF5::PimCommonAkonadi KF5::I18n KF5::CoreAddons Qt5::Widgets KF5::Contacts)
+target_link_libraries(ldapsearchdialog_gui KF5::PimCommonAkonadi KF5::I18n KF5::CoreAddons Qt::Widgets KF5::Contacts)