Commit 844505a2 authored by Laurent Montel's avatar Laurent Montel
Browse files

Use Qt:: directly

parent fe8db657
Pipeline #218903 passed with stage
in 9 minutes and 23 seconds
......@@ -11,7 +11,7 @@ macro( archivemail_agent _source)
add_executable( ${_name} ${_test} ${_name}.h)
add_test(NAME ${_name} COMMAND ${_name} )
ecm_mark_as_test(archivemailagent-${_name})
target_link_libraries( ${_name} archivemailagent Qt${QT_MAJOR_VERSION}::Test Qt${QT_MAJOR_VERSION}::Core KF5::MailCommon KF5::AkonadiCore KF5::XmlGui KF5::KIOWidgets KF5::I18n)
target_link_libraries( ${_name} archivemailagent Qt::Test Qt::Core KF5::MailCommon KF5::AkonadiCore KF5::XmlGui KF5::KIOWidgets KF5::I18n)
endmacro()
archivemail_agent(archivemailinfotest.cpp )
......
......@@ -75,7 +75,7 @@ target_link_libraries(akonadi_followupreminder_agent
KF5::Mime
KF5::CalendarCore
KF5::DBusAddons
Qt${QT_MAJOR_VERSION}::Widgets
Qt::Widgets
KF5::Notifications
KF5::I18n
KF5::XmlGui
......
......@@ -12,7 +12,7 @@ macro( followupreminder_agent _source )
ecm_add_test(${_test} ${_name}.h
TEST_NAME ${_name}
NAME_PREFIX "followupreminder-"
LINK_LIBRARIES followupreminderagent Qt${QT_MAJOR_VERSION}::Test KF5::AkonadiCore Qt${QT_MAJOR_VERSION}::Widgets KF5::I18n KF5::XmlGui KF5::Service
LINK_LIBRARIES followupreminderagent Qt::Test KF5::AkonadiCore Qt::Widgets KF5::I18n KF5::XmlGui KF5::Service
)
endmacro()
......
......@@ -7,6 +7,6 @@ macro( mailmerge_agent _source )
ecm_add_test(${_test} ${_name}.h
TEST_NAME ${_name}
NAME_PREFIX "mailmerge-"
LINK_LIBRARIES mailmergeagent Qt${QT_MAJOR_VERSION}::Test KF5::AkonadiCore Qt${QT_MAJOR_VERSION}::Widgets KF5::I18n KF5::XmlGui KF5::Service
LINK_LIBRARIES mailmergeagent Qt::Test KF5::AkonadiCore Qt::Widgets KF5::I18n KF5::XmlGui KF5::Service
)
endmacro()
......@@ -6,7 +6,7 @@ macro(add_sendlater_agent_test _source )
ecm_add_test(${_source} ${_name}.h
TEST_NAME ${_name}
NAME_PREFIX "sendlateragent-"
LINK_LIBRARIES sendlateragent Qt${QT_MAJOR_VERSION}::Test
LINK_LIBRARIES sendlateragent Qt::Test
)
endmacro()
......
......@@ -37,7 +37,7 @@ if (COMPILE_WITH_UNITY_CMAKE_SUPPORT)
endif()
target_link_libraries(ktnef
Qt${QT_MAJOR_VERSION}::Widgets
Qt::Widgets
KF5::Tnef
KF5::DBusAddons
KF5::Crash
......
......@@ -12,35 +12,35 @@ include_directories(
add_executable( displaymessageformatactionmenutest displaymessageformatactionmenutest.cpp displaymessageformatactionmenutest.h)
add_test(NAME displaymessageformatactionmenutest COMMAND displaymessageformatactionmenutest )
ecm_mark_as_test(kmail-displaymessageformatactionmenutest)
target_link_libraries( displaymessageformatactionmenutest Qt${QT_MAJOR_VERSION}::Test KF5::MessageViewer KF5::I18n kmailprivate)
target_link_libraries( displaymessageformatactionmenutest Qt::Test KF5::MessageViewer KF5::I18n kmailprivate)
#####
add_executable( identityaddvcarddialogtest identityaddvcarddialogtest.cpp identityaddvcarddialogtest.h)
ecm_mark_as_test(kmail-identityaddvcarddialogtest)
target_link_libraries( identityaddvcarddialogtest Qt${QT_MAJOR_VERSION}::Test Qt${QT_MAJOR_VERSION}::Widgets KF5::Completion KF5::KIOWidgets KF5::I18n kmailprivate)
target_link_libraries( identityaddvcarddialogtest Qt::Test Qt::Widgets KF5::Completion KF5::KIOWidgets KF5::I18n kmailprivate)
#####
add_executable( createfollowupreminderonexistingmessagejobtest createfollowupreminderonexistingmessagejobtest.cpp createfollowupreminderonexistingmessagejobtest.h)
ecm_mark_as_test(kmail_createfollowupreminderonexistingmessagejobtest)
target_link_libraries( createfollowupreminderonexistingmessagejobtest Qt${QT_MAJOR_VERSION}::Test Qt${QT_MAJOR_VERSION}::Widgets KF5::AkonadiCore KF5::CalendarCore KF5::Mime KF5::MessageComposer kmailprivate)
target_link_libraries( createfollowupreminderonexistingmessagejobtest Qt::Test Qt::Widgets KF5::AkonadiCore KF5::CalendarCore KF5::Mime KF5::MessageComposer kmailprivate)
#####
add_executable( cryptostateindicatorwidgettest cryptostateindicatorwidgettest.cpp cryptostateindicatorwidgettest.h)
add_test(NAME cryptostateindicatorwidgettest COMMAND cryptostateindicatorwidgettest)
ecm_mark_as_test(cryptostateindicatorwidgettest)
target_link_libraries( cryptostateindicatorwidgettest Qt${QT_MAJOR_VERSION}::Test KF5::MessageCore Qt${QT_MAJOR_VERSION}::Widgets KF5::ConfigWidgets KF5::I18n kmailprivate)
target_link_libraries( cryptostateindicatorwidgettest Qt::Test KF5::MessageCore Qt::Widgets KF5::ConfigWidgets KF5::I18n kmailprivate)
#####
add_executable( kactionmenutransporttest kactionmenutransporttest.cpp kactionmenutransporttest.h)
add_test(NAME kactionmenutransporttest COMMAND kactionmenutransporttest)
ecm_mark_as_test(kactionmenutransporttest)
target_link_libraries( kactionmenutransporttest Qt${QT_MAJOR_VERSION}::Test KF5::MailTransportAkonadi KF5::WidgetsAddons KF5::I18n KF5::ConfigGui kmailprivate)
target_link_libraries( kactionmenutransporttest Qt::Test KF5::MailTransportAkonadi KF5::WidgetsAddons KF5::I18n KF5::ConfigGui kmailprivate)
add_akonadi_isolated_test_advanced( kmcomposerwintest.cpp ""
"Qt${QT_MAJOR_VERSION}::Test;KF5::IdentityManagementWidgets;KF5::MessageCore;KF5::TemplateParser;KF5::XmlGui;Qt${QT_MAJOR_VERSION}::Widgets;KF5::ConfigWidgets;KF5::I18n;kmailprivate")
"Qt::Test;KF5::IdentityManagementWidgets;KF5::MessageCore;KF5::TemplateParser;KF5::XmlGui;Qt::Widgets;KF5::ConfigWidgets;KF5::I18n;kmailprivate")
add_akonadi_isolated_test_advanced( tagselectdialogtest.cpp "" "kmailprivate;KF5::MailCommon;KF5::Libkdepim;KF5::ItemViews;KF5::TemplateParser;KF5::XmlGui;KF5::Completion;KF5::I18n")
add_akonadi_isolated_test_advanced(kmcommandstest.cpp ""
"Qt${QT_MAJOR_VERSION}::Test;Qt${QT_MAJOR_VERSION}::Widgets;KF5::AkonadiCore;KF5::Bookmarks;KF5::ConfigWidgets;KF5::Contacts;KF5::I18n;KF5::IdentityManagement;KF5::KIOCore;KF5::KIOFileWidgets;KF5::MessageCore;KF5::MessageComposer;KF5::MessageList;KF5::MessageViewer;KF5::MailCommon;KF5::MailTransportAkonadi;KF5::Libkdepim;KF5::TemplateParser;kmailprivate")
"Qt::Test;Qt::Widgets;KF5::AkonadiCore;KF5::Bookmarks;KF5::ConfigWidgets;KF5::Contacts;KF5::I18n;KF5::IdentityManagement;KF5::KIOCore;KF5::KIOFileWidgets;KF5::MessageCore;KF5::MessageComposer;KF5::MessageList;KF5::MessageViewer;KF5::MailCommon;KF5::MailTransportAkonadi;KF5::Libkdepim;KF5::TemplateParser;kmailprivate")
......@@ -5,18 +5,18 @@ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
add_executable( kmail_potentialphishingemailjobtest potentialphishingemailjobtest.cpp potentialphishingemailjobtest.h)
add_test(NAME kmail_potentialphishingemailjobtest COMMAND kmail_potentialphishingemailjobtest)
ecm_mark_as_test(kmail_potentialphishingemailjobtest)
target_link_libraries( kmail_potentialphishingemailjobtest Qt${QT_MAJOR_VERSION}::Test KF5::PimCommon kmailprivate)
target_link_libraries( kmail_potentialphishingemailjobtest Qt::Test KF5::PimCommon kmailprivate)
add_executable( kmail_potentialphishingdetaildialogtest potentialphishingdetaildialogtest.cpp potentialphishingdetaildialogtest.h)
add_test(NAME kmail_potentialphishingdetaildialogtest COMMAND kmail_potentialphishingdetaildialogtest)
ecm_mark_as_test(kmail_potentialphishingdetaildialogtest)
target_link_libraries( kmail_potentialphishingdetaildialogtest Qt${QT_MAJOR_VERSION}::Test Qt${QT_MAJOR_VERSION}::Widgets KF5::ConfigCore KF5::I18n KF5::WidgetsAddons kmailprivate)
target_link_libraries( kmail_potentialphishingdetaildialogtest Qt::Test Qt::Widgets KF5::ConfigCore KF5::I18n KF5::WidgetsAddons kmailprivate)
add_executable( kmail_potentialphishingdetailwidgettest potentialphishingdetailwidgettest.cpp potentialphishingdetailwidgettest.h)
add_test(NAME kmail_potentialphishingdetailwidgettest COMMAND kmail_potentialphishingdetailwidgettest)
ecm_mark_as_test(kmail_potentialphishingdetailwidgettest)
target_link_libraries( kmail_potentialphishingdetailwidgettest Qt${QT_MAJOR_VERSION}::Test Qt${QT_MAJOR_VERSION}::Widgets KF5::ConfigCore KF5::I18n KF5::WidgetsAddons KF5::PimCommon kmailprivate)
target_link_libraries( kmail_potentialphishingdetailwidgettest Qt::Test Qt::Widgets KF5::ConfigCore KF5::I18n KF5::WidgetsAddons KF5::PimCommon kmailprivate)
......@@ -24,7 +24,7 @@ target_link_libraries( kmail_potentialphishingdetailwidgettest Qt${QT_MAJOR_VERS
add_executable( kmail_potentialphishingemailwarningtest potentialphishingemailwarningtest.cpp potentialphishingemailwarningtest.h)
add_test(NAME kmail_potentialphishingemailwarningtest COMMAND kmail_potentialphishingemailwarningtest)
ecm_mark_as_test(kmail_potentialphishingemailwarningtest)
target_link_libraries( kmail_potentialphishingemailwarningtest Qt${QT_MAJOR_VERSION}::Test Qt${QT_MAJOR_VERSION}::Widgets KF5::ConfigCore KF5::I18n KF5::WidgetsAddons kmailprivate)
target_link_libraries( kmail_potentialphishingemailwarningtest Qt::Test Qt::Widgets KF5::ConfigCore KF5::I18n KF5::WidgetsAddons kmailprivate)
......@@ -5,10 +5,10 @@ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
add_executable( kmail_incorrectidentityfolderwarningtest incorrectidentityfolderwarningtest.cpp incorrectidentityfolderwarningtest.h)
add_test(NAME kmail_incorrectidentityfolderwarningtest COMMAND kmail_incorrectidentityfolderwarningtest)
ecm_mark_as_test(kmail_incorrectidentityfolderwarningtest)
target_link_libraries( kmail_incorrectidentityfolderwarningtest Qt${QT_MAJOR_VERSION}::Test KF5::PimCommon KF5::I18n kmailprivate)
target_link_libraries( kmail_incorrectidentityfolderwarningtest Qt::Test KF5::PimCommon KF5::I18n kmailprivate)
add_executable( kmail_externaleditorwarningtest externaleditorwarningtest.cpp externaleditorwarningtest.h)
add_test(NAME kmail_externaleditorwarningtest COMMAND kmail_externaleditorwarningtest)
ecm_mark_as_test(kmail_externaleditorwarningtest)
target_link_libraries( kmail_externaleditorwarningtest Qt${QT_MAJOR_VERSION}::Test KF5::PimCommon KF5::I18n kmailprivate)
target_link_libraries( kmail_externaleditorwarningtest Qt::Test KF5::PimCommon KF5::I18n kmailprivate)
......@@ -8,7 +8,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 kmailprivate)
target_link_libraries( ${_name} Qt::Test Qt::Core KF5::AkonadiCore KF5::ConfigCore kmailprivate)
endmacro()
folderarchive_kmail(folderarchiveaccountinfotest.cpp)
......@@ -4,7 +4,7 @@ macro(add_kmail_historyswitchfolder_unittest _source)
get_filename_component(_name ${_source} NAME_WE)
ecm_add_test(${_source} ${_name}.h
TEST_NAME ${_name}
LINK_LIBRARIES kmailprivate Qt${QT_MAJOR_VERSION}::Test Qt${QT_MAJOR_VERSION}::Widgets
LINK_LIBRARIES kmailprivate Qt::Test Qt::Widgets
)
endmacro ()
......
......@@ -4,7 +4,7 @@ macro(add_kmail_job_unittest _source)
get_filename_component(_name ${_source} NAME_WE)
ecm_add_test(${_source} ${_name}.h
TEST_NAME ${_name}
LINK_LIBRARIES kmailprivate Qt${QT_MAJOR_VERSION}::Test Qt${QT_MAJOR_VERSION}::Widgets KF5::AkonadiCore
LINK_LIBRARIES kmailprivate Qt::Test Qt::Widgets KF5::AkonadiCore
)
endmacro ()
......
......@@ -29,7 +29,7 @@ pim_target_precompile_headers(kcmkmailsummary PUBLIC ../../../kmail_pch.h)
add_dependencies(kcmkmailsummary kmail_xml)
target_link_libraries(kcmkmailsummary KF5::Mime KF5::PimCommonAkonadi Qt${QT_MAJOR_VERSION}::DBus KF5::ConfigWidgets KF5::I18n)
target_link_libraries(kcmkmailsummary KF5::Mime KF5::PimCommonAkonadi Qt::DBus KF5::ConfigWidgets KF5::I18n)
########### install files ###############
......
......@@ -19,7 +19,7 @@ target_link_libraries(kontact_summaryplugin KF5::KCMUtils KF5::I18n KF5::Identit
add_library(kcmkontactsummary MODULE kcmkontactsummary.cpp kcmkontactsummary.h)
pim_target_precompile_headers(kcmkontactsummary PUBLIC ../../../kmail_pch.h)
target_link_libraries(kcmkontactsummary KF5::I18n Qt${QT_MAJOR_VERSION}::Widgets KF5::I18n KF5::KontactInterface)
target_link_libraries(kcmkontactsummary KF5::I18n Qt::Widgets KF5::I18n KF5::KontactInterface)
########### install files ###############
......
......@@ -7,11 +7,11 @@ set(dbustest_SRCS dbustest.cpp)
qt_add_dbus_interfaces(dbustest_SRCS ${kmail_BINARY_DIR}/src/org.kde.kmail.kmail.xml)
add_executable(dbustest ${dbustest_SRCS})
add_dependencies(dbustest kmail_xml)
target_link_libraries(dbustest KF5::KIOCore KF5::I18n Qt${QT_MAJOR_VERSION}::DBus)
target_link_libraries(dbustest KF5::KIOCore KF5::I18n Qt::DBus)
#####
add_executable(searchdbustest searchdbustest.cpp searchdbustest.h)
target_link_libraries(searchdbustest Qt${QT_MAJOR_VERSION}::DBus Qt${QT_MAJOR_VERSION}::Widgets KF5::PimCommonAkonadi)
target_link_libraries(searchdbustest Qt::DBus Qt::Widgets KF5::PimCommonAkonadi)
#####
add_executable(searchmailertest searchmailertest.cpp)
......
......@@ -4,7 +4,7 @@ macro(add_kmail_undosend_unittest _source)
get_filename_component(_name ${_source} NAME_WE)
ecm_add_test(${_source} ${_name}.h
TEST_NAME ${_name}
LINK_LIBRARIES kmailprivate Qt${QT_MAJOR_VERSION}::Test Qt${QT_MAJOR_VERSION}::Widgets
LINK_LIBRARIES kmailprivate Qt::Test Qt::Widgets
)
endmacro ()
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment