Use Qt:: directly

serializers/autotests/CMakeLists.txt

@@ -5,6 +5,6 @@ include(ECMAddTests)
 ecm_qt_declare_logging_category(akonadi_serializer_autotest_addressee_SRCS HEADER serializer_debug.h IDENTIFIER AKONADI_SERIALIZER_CONTACT_LOG CATEGORY_NAME org.kde.pim.contact_serializer)
 
 ecm_add_test(addresseeserializertest.cpp ../akonadi_serializer_addressee.cpp ${akonadi_serializer_autotest_addressee_SRCS}
-    LINK_LIBRARIES KF5::AkonadiCore KF5::AkonadiContact KF5::Contacts KF5::I18n Qt${QT_MAJOR_VERSION}::Core Qt${QT_MAJOR_VERSION}::Test
+    LINK_LIBRARIES KF5::AkonadiCore KF5::AkonadiContact KF5::Contacts KF5::I18n Qt::Core Qt::Test
     TEST_NAME addresseeserializertest
 )

src/akonadi-contacts/CMakeLists.txt

@@ -202,7 +202,7 @@ target_link_libraries(KF5AkonadiContact
     KF5::AkonadiCore
     KF5::Contacts
     KF5::AkonadiWidgets
-    Qt${QT_MAJOR_VERSION}::Widgets
+    Qt::Widgets
     KF5::GrantleeTheme
     PRIVATE
     KF5::ConfigCore

src/akonadi-contacts/autotests/CMakeLists.txt

@@ -11,7 +11,7 @@ macro(add_akonadi_contact_demo _source)
   add_test(NAME ${_name} COMMAND ${_name} )
   target_link_libraries(${_name}
      KF5::AkonadiContact
-     Qt${QT_MAJOR_VERSION}::Test)
+     Qt::Test)
   ecm_mark_as_test(${_name})
 endmacro()
 
@@ -20,5 +20,5 @@ endmacro()
 add_akonadi_contact_demo(contactmetadataattributetest.cpp)
 
 ecm_add_test(grantleeprinttest.cpp
-    LINK_LIBRARIES KF5::AkonadiContact Qt${QT_MAJOR_VERSION}::Test KF5::Contacts
+    LINK_LIBRARIES KF5::AkonadiContact Qt::Test KF5::Contacts
 )

src/akonadi-contacts/tests/CMakeLists.txt

@@ -12,7 +12,7 @@ macro(add_akonadi_contact_demo _source)
      KF5::Completion
      KF5::I18n
      KF5::WidgetsAddons
-     Qt${QT_MAJOR_VERSION}::Test)
+     Qt::Test)
   ecm_mark_as_test(${_name})
 endmacro()
 

src/contact-editor/CMakeLists.txt

@@ -161,7 +161,7 @@ target_include_directories(KF5ContactEditor PUBLIC "$<BUILD_INTERFACE:${Akonadi-
 target_link_libraries(KF5ContactEditor
     PUBLIC
     KF5::Contacts
-    Qt${QT_MAJOR_VERSION}::Widgets
+    Qt::Widgets
     PRIVATE
     KF5::Completion
     KF5::ConfigCore

src/contact-editor/editor/addresseditor/autotests/CMakeLists.txt

@@ -9,4 +9,4 @@ set(addresslocationwidget_SRCS addresslocationwidgettest.cpp addresslocationwidg
 add_executable(addresslocationwidget ${addresslocationwidget_SRCS})
 add_test(NAME addresslocationwidget COMMAND addresslocationwidget)
 ecm_mark_as_test(addresslocationwidget)
-target_link_libraries(addresslocationwidget Qt${QT_MAJOR_VERSION}::Test  Qt${QT_MAJOR_VERSION}::Widgets KF5::ContactEditor KF5::Contacts KF5::I18n KF5::Completion KF5::WidgetsAddons)
+target_link_libraries(addresslocationwidget Qt::Test  Qt::Widgets KF5::ContactEditor KF5::Contacts KF5::I18n KF5::Completion KF5::WidgetsAddons)

src/contact-editor/editor/customfieldeditor/autotests/CMakeLists.txt

@@ -5,13 +5,13 @@ set(customfieldswidgettest_SRCS customfieldswidgettest.cpp customfieldswidgettes
 add_executable(customfieldswidgettest ${customfieldswidgettest_SRCS})
 add_test(NAME customfieldswidgettest COMMAND customfieldswidgettest)
 ecm_mark_as_test(customfieldswidgettest)
-target_link_libraries(customfieldswidgettest Qt${QT_MAJOR_VERSION}::Test Qt${QT_MAJOR_VERSION}::Widgets KF5::ContactEditor KF5::Contacts KF5::I18n KF5::Completion KF5::ConfigCore KF5::WidgetsAddons)
+target_link_libraries(customfieldswidgettest Qt::Test Qt::Widgets KF5::ContactEditor KF5::Contacts KF5::I18n KF5::Completion KF5::ConfigCore KF5::WidgetsAddons)
 
 
 add_executable(customfieldeditorwidgettest customfieldeditorwidgettest.cpp customfieldeditorwidgettest.h ../customfieldeditorwidget.cpp)
 add_test(NAME customfieldeditorwidgettest COMMAND customfieldeditorwidgettest)
 ecm_mark_as_test(customfieldeditorwidgettest)
-target_link_libraries(customfieldeditorwidgettest Qt${QT_MAJOR_VERSION}::Test Qt${QT_MAJOR_VERSION}::Widgets KF5::ContactEditor KF5::Contacts KF5::I18n KF5::Completion KF5::WidgetsAddons)
+target_link_libraries(customfieldeditorwidgettest Qt::Test Qt::Widgets KF5::ContactEditor KF5::Contacts KF5::I18n KF5::Completion KF5::WidgetsAddons)
 
 add_executable(customfieldslistwidgettest)
 target_sources(customfieldslistwidgettest PRIVATE
@@ -21,4 +21,4 @@ target_sources(customfieldslistwidgettest PRIVATE
 )
 add_test(NAME customfieldslistwidgettest COMMAND customfieldslistwidgettest)
 ecm_mark_as_test(customfieldslistwidgettest)
-target_link_libraries(customfieldslistwidgettest Qt${QT_MAJOR_VERSION}::Test  Qt${QT_MAJOR_VERSION}::Widgets KF5::ContactEditor KF5::Contacts KF5::I18n KF5::Completion KF5::ConfigCore KF5::WidgetsAddons)
+target_link_libraries(customfieldslistwidgettest Qt::Test  Qt::Widgets KF5::ContactEditor KF5::Contacts KF5::I18n KF5::Completion KF5::ConfigCore KF5::WidgetsAddons)

src/contact-editor/editor/customfieldeditor/tests/CMakeLists.txt

@@ -13,7 +13,7 @@ set(customfieldeditor_SRCS
 add_executable(customfieldeditortest ${customfieldeditor_SRCS})
 
 target_link_libraries(customfieldeditortest
-    Qt${QT_MAJOR_VERSION}::Widgets
+    Qt::Widgets
     KF5::ContactEditor
     KF5::Contacts
     KF5::I18n

src/contact-editor/editor/generalinfoeditor/autotests/CMakeLists.txt

@@ -6,20 +6,20 @@ set(phonewidgettest_SRCS phonewidgettest.cpp phonewidgettest.h)
 add_executable(phonewidgettest ${phonewidgettest_SRCS})
 add_test(NAME phonewidgettest COMMAND phonewidgettest)
 ecm_mark_as_test(phonewidgettest)
-target_link_libraries(phonewidgettest Qt${QT_MAJOR_VERSION}::Test  KF5::ContactEditor KF5::Contacts KF5::I18n KF5::Completion)
+target_link_libraries(phonewidgettest Qt::Test  KF5::ContactEditor KF5::Contacts KF5::I18n KF5::Completion)
 
 
 set(mailwidgettest_SRCS mailwidgettest.cpp mailwidgettest.h)
 add_executable(mailwidgettest ${mailwidgettest_SRCS})
 add_test(NAME mailwidgettest COMMAND mailwidgettest)
 ecm_mark_as_test(mailwidgettest)
-target_link_libraries(mailwidgettest Qt${QT_MAJOR_VERSION}::Test KF5::ContactEditor KF5::Contacts KF5::I18n KF5::Completion)
+target_link_libraries(mailwidgettest Qt::Test KF5::ContactEditor KF5::Contacts KF5::I18n KF5::Completion)
 
 set(messagingwidgettest_SRCS messagingwidgettest.cpp messagingwidgettest.h ../../widgets/preferredlineeditwidget.cpp)
 add_executable(messagingwidgettest ${messagingwidgettest_SRCS})
 add_test(NAME messagingwidgettest COMMAND messagingwidgettest)
 ecm_mark_as_test(messagingwidgettest)
-target_link_libraries(messagingwidgettest Qt${QT_MAJOR_VERSION}::Test KF5::ContactEditor KF5::Contacts KF5::I18n KF5::Completion KF5::Service)
+target_link_libraries(messagingwidgettest Qt::Test KF5::ContactEditor KF5::Contacts KF5::I18n KF5::Completion KF5::Service)
 
 
 
@@ -27,24 +27,24 @@ set(contactselecttypecomboboxtest_SRCS contactselecttypecomboboxtest.cpp contact
 add_executable(contactselecttypecomboboxtest ${contactselecttypecomboboxtest_SRCS})
 add_test(NAME contactselecttypecomboboxtest COMMAND contactselecttypecomboboxtest)
 ecm_mark_as_test(contactselecttypecomboboxtest)
-target_link_libraries(contactselecttypecomboboxtest Qt${QT_MAJOR_VERSION}::Test  Qt${QT_MAJOR_VERSION}::Widgets KF5::ContactEditor KF5::I18n )
+target_link_libraries(contactselecttypecomboboxtest Qt::Test  Qt::Widgets KF5::ContactEditor KF5::I18n )
 
 
 set(nicknamewidgettest_SRCS nicknamewidgettest.cpp nicknamewidgettest.h)
 add_executable(nicknamewidgettest ${nicknamewidgettest_SRCS})
 add_test(NAME nicknamewidgettest COMMAND nicknamewidgettest)
 ecm_mark_as_test(nicknamewidgettest)
-target_link_libraries(nicknamewidgettest Qt${QT_MAJOR_VERSION}::Test  Qt${QT_MAJOR_VERSION}::Widgets KF5::ContactEditor KF5::I18n KF5::Completion)
+target_link_libraries(nicknamewidgettest Qt::Test  Qt::Widgets KF5::ContactEditor KF5::I18n KF5::Completion)
 
 set(blogfeedwidgettest_SRCS blogfeedwidgettest.cpp blogfeedwidgettest.h)
 add_executable(blogfeedwidgettest ${blogfeedwidgettest_SRCS})
 add_test(NAME blogfeedwidgettest COMMAND blogfeedwidgettest)
 ecm_mark_as_test(blogfeedwidgettest)
-target_link_libraries(blogfeedwidgettest Qt${QT_MAJOR_VERSION}::Test  Qt${QT_MAJOR_VERSION}::Widgets KF5::ContactEditor KF5::I18n KF5::Completion)
+target_link_libraries(blogfeedwidgettest Qt::Test  Qt::Widgets KF5::ContactEditor KF5::I18n KF5::Completion)
 
 
 set(messageformattingwidgettest_SRCS messageformattingwidgettest.cpp messageformattingwidgettest.h)
 add_executable(messageformattingwidgettest ${messageformattingwidgettest_SRCS})
 add_test(NAME messageformattingwidgettest COMMAND messageformattingwidgettest)
 ecm_mark_as_test(messageformattingwidgettest)
-target_link_libraries(messageformattingwidgettest Qt${QT_MAJOR_VERSION}::Test  Qt${QT_MAJOR_VERSION}::Widgets KF5::ContactEditor KF5::I18n )
+target_link_libraries(messageformattingwidgettest Qt::Test  Qt::Widgets KF5::ContactEditor KF5::I18n )

src/contact-editor/editor/generalinfoeditor/tests/CMakeLists.txt

@@ -21,7 +21,7 @@ set(generalinfoeditor_SRCS
 add_executable(generalinfoeditortest ${generalinfoeditor_SRCS})
 
 target_link_libraries(generalinfoeditortest
-    Qt${QT_MAJOR_VERSION}::Widgets
+    Qt::Widgets
     KF5::ContactEditor
     KF5::Contacts
     KF5::I18n

src/contact-editor/editor/widgets/autotests/CMakeLists.txt

@@ -4,4 +4,4 @@ set( preferredlineeditwidgettest_SRCS preferredlineeditwidgettest.cpp preferredl
 add_executable( preferredlineeditwidgettest ${preferredlineeditwidgettest_SRCS})
 add_test(NAME preferredlineeditwidgettest COMMAND preferredlineeditwidgettest)
 ecm_mark_as_test(preferredlineeditwidgettest)
-target_link_libraries( preferredlineeditwidgettest Qt${QT_MAJOR_VERSION}::Test Qt${QT_MAJOR_VERSION}::Widgets KF5::Completion KF5::I18n)
+target_link_libraries( preferredlineeditwidgettest Qt::Test Qt::Widgets KF5::Completion KF5::I18n)