Use Qt:: directly

src/kmailtransport/CMakeLists.txt

@@ -82,8 +82,8 @@ target_link_libraries(KF5MailTransport
     KF5::CoreAddons
     KF5::Wallet
     KF5::ConfigWidgets
-    Qt${QT_MAJOR_VERSION}::DBus
-    Qt${QT_MAJOR_VERSION}::Network
+    Qt::DBus
+    Qt::Network
     )
 
 target_link_libraries(KF5MailTransport PRIVATE qt${QT_MAJOR_VERSION}keychain)

src/kmailtransport/plugins/smtp/autotests/CMakeLists.txt

@@ -6,8 +6,8 @@ ecm_add_test(smtpjobtest.cpp
              ../smtpjob.cpp
              ${CMAKE_CURRENT_BINARY_DIR}/../mailtransportplugin_smtp_debug.cpp
              fakeserver.cpp
-    LINK_LIBRARIES Qt${QT_MAJOR_VERSION}::Network
-                   Qt${QT_MAJOR_VERSION}::Test
+    LINK_LIBRARIES Qt::Network
+                   Qt::Test
                    KF5::MailTransport
                    KF5::I18n
                    KF5::ConfigWidgets

src/kmailtransport/tests/CMakeLists.txt

@@ -5,13 +5,13 @@ find_package(KF5TextWidgets ${KF5_MIN_VERSION} CONFIG REQUIRED)
 
 add_executable(transportmgr transportmgr.cpp transportmgr.h)
 ecm_mark_as_test(transportmgr)
-target_link_libraries(transportmgr KF5MailTransport Qt${QT_MAJOR_VERSION}::Widgets KF5::I18n KF5::ConfigGui KF5::TextWidgets KF5::CoreAddons)
+target_link_libraries(transportmgr KF5MailTransport Qt::Widgets KF5::I18n KF5::ConfigGui KF5::TextWidgets KF5::CoreAddons)
 
 add_executable(servertest servertest.cpp)
 ecm_mark_as_test(servertest)
-target_link_libraries(servertest KF5MailTransport KF5::I18n KF5::ConfigGui Qt${QT_MAJOR_VERSION}::Widgets)
+target_link_libraries(servertest KF5MailTransport KF5::I18n KF5::ConfigGui Qt::Widgets)
 
 
 add_executable(addtransportdialogng_gui addtransportdialogng_gui.cpp)
 ecm_mark_as_test(addtransportdialogng_gui)
-target_link_libraries(addtransportdialogng_gui KF5MailTransport KF5::I18n KF5::ConfigGui Qt${QT_MAJOR_VERSION}::Widgets)
+target_link_libraries(addtransportdialogng_gui KF5MailTransport KF5::I18n KF5::ConfigGui Qt::Widgets)

src/kmailtransportakonadi/plugins/CMakeLists.txt

@@ -23,5 +23,5 @@ target_link_libraries(mailtransport_akonadiplugin
     KF5::AkonadiWidgets
     KF5::I18n
     KF5::ConfigWidgets
-    Qt${QT_MAJOR_VERSION}::DBus
+    Qt::DBus
     )

src/kmailtransportakonadi/tests/CMakeLists.txt

@@ -6,20 +6,20 @@ find_package(KF5TextWidgets ${KF5_MIN_VERSION} CONFIG REQUIRED)
 set(queuer_srcs queuer.cpp)
 add_executable(queuer ${queuer_srcs})
 ecm_mark_as_test(queuer)
-target_link_libraries(queuer KF5MailTransportAkonadi KF5MailTransport Qt${QT_MAJOR_VERSION}::Widgets KF5::I18n KF5::ConfigGui KF5::TextWidgets)
+target_link_libraries(queuer KF5MailTransportAkonadi KF5MailTransport Qt::Widgets KF5::I18n KF5::ConfigGui KF5::TextWidgets)
 
 set( sendqueued_srcs sendqueued.cpp )
 add_executable( sendqueued ${sendqueued_srcs} )
 ecm_mark_as_test(sendqueued)
-target_link_libraries( sendqueued KF5MailTransportAkonadi  KF5::AkonadiMime Qt${QT_MAJOR_VERSION}::Widgets)
+target_link_libraries( sendqueued KF5MailTransportAkonadi  KF5::AkonadiMime Qt::Widgets)
 
 set( clearerror_srcs clearerror.cpp )
 add_executable( clearerror ${clearerror_srcs} )
 ecm_mark_as_test(clearerror)
-target_link_libraries( clearerror KF5MailTransportAkonadi  KF5::AkonadiMime Qt${QT_MAJOR_VERSION}::Widgets)
+target_link_libraries( clearerror KF5MailTransportAkonadi  KF5::AkonadiMime Qt::Widgets)
 
 set( abort_srcs abort.cpp )
 add_executable( abort ${abort_srcs} )
 ecm_mark_as_test(abort)
-target_link_libraries( abort KF5MailTransportAkonadi KF5::AkonadiCore Qt${QT_MAJOR_VERSION}::Widgets)
+target_link_libraries( abort KF5MailTransportAkonadi KF5::AkonadiCore Qt::Widgets)