Commit a4407b19 authored by Laurent Montel's avatar Laurent Montel
Browse files

Use Qt:: directly

parent c4189ba7
Pipeline #218926 passed with stage
in 3 minutes and 53 seconds
......@@ -13,5 +13,5 @@ ecm_qt_declare_logging_category(pimdataexporterconsole_loginfiletest_SRCS HEADER
add_executable( pimdataexporterconsole_loginfiletest loginfiletest.cpp loginfiletest.h ../loginfile.cpp ${pimdataexporterconsole_loginfiletest_SRCS})
add_test(NAME pimdataexporterconsole_loginfiletest COMMAND pimdataexporterconsole_loginfiletest)
ecm_mark_as_test(pimdataexporterconsole_loginfiletest)
target_link_libraries( pimdataexporterconsole_loginfiletest Qt${QT_MAJOR_VERSION}::Test)
target_link_libraries( pimdataexporterconsole_loginfiletest Qt::Test)
......@@ -6,7 +6,7 @@ add_definitions( -DPIMDATAINSTALL_DIR="${CMAKE_CURRENT_BINARY_DIR}/install" )
add_executable( utilstest utilstest.cpp utilstest.h)
add_test(NAME utilstest COMMAND utilstest)
ecm_mark_as_test(utilstest)
target_link_libraries( utilstest Qt${QT_MAJOR_VERSION}::Test pimdataexporterprivate KF5::ConfigCore)
target_link_libraries( utilstest Qt::Test pimdataexporterprivate KF5::ConfigCore)
#####
add_library(test_resourceconverter STATIC
......@@ -42,20 +42,20 @@ add_library(test_resourceconverter STATIC
if (COMPILE_WITH_UNITY_CMAKE_SUPPORT)
set_target_properties(test_resourceconverter PROPERTIES UNITY_BUILD ON)
endif()
target_link_libraries(test_resourceconverter PUBLIC KF5::ConfigCore pimdataexporterprivate KF5::Archive Qt${QT_MAJOR_VERSION}::Test KF5::AkonadiMime KF5::AkonadiCore KF5::WidgetsAddons)
target_link_libraries(test_resourceconverter PUBLIC KF5::ConfigCore pimdataexporterprivate KF5::Archive Qt::Test KF5::AkonadiMime KF5::AkonadiCore KF5::WidgetsAddons)
#####
add_executable( resourceconverterclasstest resourceconverterclasstest.cpp resourceconverterclasstest.h)
add_test(NAME resourceconverterclasstest COMMAND resourceconverterclasstest)
ecm_mark_as_test(resourceconverterclasstest)
target_link_libraries( resourceconverterclasstest Qt${QT_MAJOR_VERSION}::Test KF5::ConfigCore test_resourceconverter)
target_link_libraries( resourceconverterclasstest Qt::Test KF5::ConfigCore test_resourceconverter)
#####
add_executable( backupresourcefilejobimpltest backupresourcefilejobimpltest.cpp backupresourcefilejobimpltest.h)
add_test(NAME backupresourcefilejobimpltest COMMAND backupresourcefilejobimpltest)
ecm_mark_as_test(backupresourcefilejobimpltest)
target_link_libraries( backupresourcefilejobimpltest Qt${QT_MAJOR_VERSION}::Test KF5::ConfigCore pimdataexporterprivate KF5::Archive)
target_link_libraries( backupresourcefilejobimpltest Qt::Test KF5::ConfigCore pimdataexporterprivate KF5::Archive)
###
add_subdirectory(notes)
......
......@@ -8,7 +8,7 @@ set( exportaddressbookjobinterfacetest_SRCS exportaddressbookjobinterfacetest.cp
add_executable( exportaddressbookjobinterfacetest ${exportaddressbookjobinterfacetest_SRCS})
add_test(NAME exportaddressbookjobinterfacetest COMMAND exportaddressbookjobinterfacetest)
ecm_mark_as_test(exportaddressbookjobinterfacetest)
target_link_libraries(exportaddressbookjobinterfacetest Qt${QT_MAJOR_VERSION}::Test pimdataexporterprivate KF5::ConfigCore test_resourceconverter)
target_link_libraries(exportaddressbookjobinterfacetest Qt::Test pimdataexporterprivate KF5::ConfigCore test_resourceconverter)
#####
set( importaddressbookjobinterfacetest_SRCS importaddressbookjobinterfacetest.cpp importaddressbookjobinterfacetestimpl.cpp
......@@ -17,4 +17,4 @@ set( importaddressbookjobinterfacetest_SRCS importaddressbookjobinterfacetest.cp
add_executable( importaddressbookjobinterfacetest ${importaddressbookjobinterfacetest_SRCS})
add_test(NAME importaddressbookjobinterfacetest COMMAND importaddressbookjobinterfacetest)
ecm_mark_as_test(importaddressbookjobinterfacetest)
target_link_libraries(importaddressbookjobinterfacetest Qt${QT_MAJOR_VERSION}::Test pimdataexporterprivate KF5::ConfigCore test_resourceconverter)
target_link_libraries(importaddressbookjobinterfacetest Qt::Test pimdataexporterprivate KF5::ConfigCore test_resourceconverter)
......@@ -9,7 +9,7 @@ set( exportakregatorjobinterfacetest_SRCS exportakregatorjobinterfacetest.cpp ex
add_executable( exportakregatorjobinterfacetest ${exportakregatorjobinterfacetest_SRCS})
add_test(NAME exportakregatorjobinterfacetest COMMAND exportakregatorjobinterfacetest)
ecm_mark_as_test(exportakregatorjobinterfacetest)
target_link_libraries(exportakregatorjobinterfacetest Qt${QT_MAJOR_VERSION}::Test pimdataexporterprivate KF5::ConfigCore test_resourceconverter)
target_link_libraries(exportakregatorjobinterfacetest Qt::Test pimdataexporterprivate KF5::ConfigCore test_resourceconverter)
#####
......@@ -19,4 +19,4 @@ set( importakregatorjobinterfacetest_SRCS importakregatorjobinterfacetest.cpp im
add_executable( importakregatorjobinterfacetest ${importakregatorjobinterfacetest_SRCS})
add_test(NAME importakregatorjobinterfacetest COMMAND importakregatorjobinterfacetest)
ecm_mark_as_test(importakregatorjobinterfacetest)
target_link_libraries(importakregatorjobinterfacetest Qt${QT_MAJOR_VERSION}::Test pimdataexporterprivate KF5::ConfigCore test_resourceconverter)
target_link_libraries(importakregatorjobinterfacetest Qt::Test pimdataexporterprivate KF5::ConfigCore test_resourceconverter)
......@@ -9,7 +9,7 @@ set( exportalarmjobinterfacetest_SRCS exportalarmjobinterfacetest.cpp exportalar
add_executable( exportalarmjobinterfacetest ${exportalarmjobinterfacetest_SRCS})
add_test(NAME exportalarmjobinterfacetest COMMAND exportalarmjobinterfacetest)
ecm_mark_as_test(exportalarmjobinterfacetest)
target_link_libraries(exportalarmjobinterfacetest Qt${QT_MAJOR_VERSION}::Test pimdataexporterprivate KF5::ConfigCore test_resourceconverter)
target_link_libraries(exportalarmjobinterfacetest Qt::Test pimdataexporterprivate KF5::ConfigCore test_resourceconverter)
#####
......@@ -19,4 +19,4 @@ set( importalarmjobinterfacetest_SRCS importalarmjobinterfacetest.cpp importalar
add_executable( importalarmjobinterfacetest ${importalarmjobinterfacetest_SRCS})
add_test(NAME importalarmjobinterfacetest COMMAND importalarmjobinterfacetest)
ecm_mark_as_test(importalarmjobinterfacetest)
target_link_libraries(importalarmjobinterfacetest Qt${QT_MAJOR_VERSION}::Test pimdataexporterprivate KF5::ConfigCore test_resourceconverter)
target_link_libraries(importalarmjobinterfacetest Qt::Test pimdataexporterprivate KF5::ConfigCore test_resourceconverter)
......@@ -9,7 +9,7 @@ set( exportcalendarsjobinterfacetest_SRCS exportcalendarsjobinterfacetest.cpp ex
add_executable( exportcalendarsjobinterfacetest ${exportcalendarsjobinterfacetest_SRCS})
add_test(NAME exportcalendarsjobinterfacetest COMMAND exportcalendarsjobinterfacetest)
ecm_mark_as_test(exportcalendarsjobinterfacetest)
target_link_libraries(exportcalendarsjobinterfacetest Qt${QT_MAJOR_VERSION}::Test pimdataexporterprivate KF5::ConfigCore test_resourceconverter)
target_link_libraries(exportcalendarsjobinterfacetest Qt::Test pimdataexporterprivate KF5::ConfigCore test_resourceconverter)
#####
......@@ -19,4 +19,4 @@ set( importcalendarjobinterfacetest_SRCS importcalendarjobinterfacetest.cpp impo
add_executable( importcalendarjobinterfacetest ${importcalendarjobinterfacetest_SRCS})
add_test(NAME importcalendarjobinterfacetest COMMAND importcalendarjobinterfacetest)
ecm_mark_as_test(importcalendarjobinterfacetest)
target_link_libraries(importcalendarjobinterfacetest Qt${QT_MAJOR_VERSION}::Test pimdataexporterprivate KF5::ConfigCore test_resourceconverter)
target_link_libraries(importcalendarjobinterfacetest Qt::Test pimdataexporterprivate KF5::ConfigCore test_resourceconverter)
......@@ -11,7 +11,7 @@ target_sources( exportmailjobinterfacetest PRIVATE exportmailjobinterfacetest.cp
add_test(NAME exportmailjobinterfacetest COMMAND exportmailjobinterfacetest)
ecm_mark_as_test(exportmailjobinterfacetest)
target_link_libraries(exportmailjobinterfacetest Qt${QT_MAJOR_VERSION}::Test pimdataexporterprivate KF5::ConfigCore test_resourceconverter KF5::Mime)
target_link_libraries(exportmailjobinterfacetest Qt::Test pimdataexporterprivate KF5::ConfigCore test_resourceconverter KF5::Mime)
#####
......@@ -24,19 +24,19 @@ target_sources( importmailjobinterfacetest PRIVATE importmailjobinterfacetest.cp
add_test(NAME importmailjobinterfacetest COMMAND importmailjobinterfacetest)
ecm_mark_as_test(importmailjobinterfacetest)
target_link_libraries(importmailjobinterfacetest Qt${QT_MAJOR_VERSION}::Test pimdataexporterprivate KF5::ConfigCore KF5::AkonadiCore KF5::AkonadiMime test_resourceconverter KF5::IdentityManagement KF5::Mime)
target_link_libraries(importmailjobinterfacetest Qt::Test pimdataexporterprivate KF5::ConfigCore KF5::AkonadiCore KF5::AkonadiMime test_resourceconverter KF5::IdentityManagement KF5::Mime)
#####
add_executable( exportmailfolderattributejobtest)
target_sources( exportmailfolderattributejobtest PRIVATE exportmailfolderattributejobtest.cpp exportmailfolderattributejobtest.h)
add_test(NAME exportmailfolderattributejobtest COMMAND exportmailfolderattributejobtest)
ecm_mark_as_test(exportmailfolderattributejobtest)
target_link_libraries(exportmailfolderattributejobtest Qt${QT_MAJOR_VERSION}::Test pimdataexporterprivate KF5::ConfigCore)
target_link_libraries(exportmailfolderattributejobtest Qt::Test pimdataexporterprivate KF5::ConfigCore)
#####
add_executable( importmailfolderattributejobtest)
target_sources( importmailfolderattributejobtest PRIVATE importmailfolderattributejobtest.cpp importmailfolderattributejobtest.h)
add_test(NAME importmailfolderattributejobtest COMMAND importmailfolderattributejobtest)
ecm_mark_as_test(importmailfolderattributejobtest)
target_link_libraries(importmailfolderattributejobtest Qt${QT_MAJOR_VERSION}::Test pimdataexporterprivate KF5::AkonadiCore KF5::ConfigCore)
target_link_libraries(importmailfolderattributejobtest Qt::Test pimdataexporterprivate KF5::AkonadiCore KF5::ConfigCore)
......@@ -9,7 +9,7 @@ set( exportnotesjobinterfacetest_SRCS exportnotesjobinterfacetest.cpp exportnote
add_executable( exportnotesjobinterfacetest ${exportnotesjobinterfacetest_SRCS})
add_test(NAME exportnotesjobinterfacetest COMMAND exportnotesjobinterfacetest)
ecm_mark_as_test(exportnotesjobinterfacetest)
target_link_libraries( exportnotesjobinterfacetest Qt${QT_MAJOR_VERSION}::Test pimdataexporterprivate test_resourceconverter KF5::ConfigCore KF5::Archive KF5::AkonadiCore)
target_link_libraries( exportnotesjobinterfacetest Qt::Test pimdataexporterprivate test_resourceconverter KF5::ConfigCore KF5::Archive KF5::AkonadiCore)
#######
set( importnotesjobinterfacetest_SRCS importnotesjobinterfacetest.cpp importnotesjobinterfacetestimpl.cpp
......@@ -18,4 +18,4 @@ set( importnotesjobinterfacetest_SRCS importnotesjobinterfacetest.cpp importnote
add_executable( importnotesjobinterfacetest ${importnotesjobinterfacetest_SRCS})
add_test(NAME importnotesjobinterfacetest COMMAND importnotesjobinterfacetest)
ecm_mark_as_test(importnotesjobinterfacetest)
target_link_libraries( importnotesjobinterfacetest Qt${QT_MAJOR_VERSION}::Test pimdataexporterprivate test_resourceconverter KF5::ConfigCore KF5::Archive)
target_link_libraries( importnotesjobinterfacetest Qt::Test pimdataexporterprivate test_resourceconverter KF5::ConfigCore KF5::Archive)
......@@ -9,7 +9,7 @@ kconfig_add_kcfg_files(pimdataexporter_kcfg_SRCS ${pimdataexporter_kcfg_SRCS})
add_executable( synchronizeresourcedialogtest synchronizeresourcedialogtest.cpp synchronizeresourcedialogtest.h ../dialog/synchronizeresourcedialog.cpp)
add_test(NAME synchronizeresourcedialogtest COMMAND synchronizeresourcedialogtest)
ecm_mark_as_test(synchronizeresourcedialogtest)
target_link_libraries(synchronizeresourcedialogtest Qt${QT_MAJOR_VERSION}::Test Qt${QT_MAJOR_VERSION}::Widgets KF5::I18n KF5::ItemViews KF5::ConfigCore)
target_link_libraries(synchronizeresourcedialogtest Qt::Test Qt::Widgets KF5::I18n KF5::ItemViews KF5::ConfigCore)
set(pimdataexporter_userfeedback_LIB)
if (TARGET KUserFeedbackWidgets)
......@@ -19,25 +19,25 @@ endif()
#add_executable( pimdataexporterconfiguredialogtest pimdataexporterconfiguredialogtest.cpp ../dialog/pimdataexporterconfiguredialog.cpp ../widgets/pimdataexporterconfigurewidget.cpp ${pimdataexporter_kcfg_SRCS})
#add_test(NAME pimdataexporterconfiguredialogtest COMMAND pimdataexporterconfiguredialogtest)
#ecm_mark_as_test(pimdataexporterconfiguredialogtest)
#target_link_libraries(pimdataexporterconfiguredialogtest ${pimdataexporter_userfeedback_LIB} Qt${QT_MAJOR_VERSION}::Test Qt${QT_MAJOR_VERSION}::Widgets KF5::I18n KF5::ItemViews KF5::ConfigCore KF5::ConfigGui KF5::WidgetsAddons)
#target_link_libraries(pimdataexporterconfiguredialogtest ${pimdataexporter_userfeedback_LIB} Qt::Test Qt::Widgets KF5::I18n KF5::ItemViews KF5::ConfigCore KF5::ConfigGui KF5::WidgetsAddons)
add_executable( pimdataexporterconfigurewidgettest pimdataexporterconfigurewidgettest.cpp pimdataexporterconfigurewidgettest.h
../widgets/pimdataexporterconfigurewidget.cpp ${pimdataexporter_kcfg_SRCS})
add_test(NAME pimdataexporterconfigurewidgettest COMMAND pimdataexporterconfigurewidgettest)
ecm_mark_as_test(pimdataexporterconfigurewidgettest)
target_link_libraries(pimdataexporterconfigurewidgettest Qt${QT_MAJOR_VERSION}::Test Qt${QT_MAJOR_VERSION}::Widgets KF5::I18n KF5::ItemViews KF5::ConfigCore KF5::ConfigGui)
target_link_libraries(pimdataexporterconfigurewidgettest Qt::Test Qt::Widgets KF5::I18n KF5::ItemViews KF5::ConfigCore KF5::ConfigGui)
add_executable( selectiontypetreewidgettest selectiontypetreewidgettest.cpp selectiontypetreewidgettest.h
../widgets/selectiontypetreewidget.cpp ${pimdataexporter_kcfg_SRCS})
add_test(NAME selectiontypetreewidgettest COMMAND selectiontypetreewidgettest)
ecm_mark_as_test(selectiontypetreewidgettest)
target_link_libraries(selectiontypetreewidgettest Qt${QT_MAJOR_VERSION}::Test Qt${QT_MAJOR_VERSION}::Widgets KF5::I18n KF5::ItemViews pimdataexporterprivate KF5::ConfigCore KF5::ConfigGui KF5::PimCommonAkonadi)
target_link_libraries(selectiontypetreewidgettest Qt::Test Qt::Widgets KF5::I18n KF5::ItemViews pimdataexporterprivate KF5::ConfigCore KF5::ConfigGui KF5::PimCommonAkonadi)
add_executable( selectiontypedialogtest selectiontypedialogtest.h selectiontypedialogtest.cpp
../widgets/selectiontypetreewidget.cpp ../dialog/selectiontypedialog.cpp ${pimdataexporter_kcfg_SRCS})
add_test(NAME selectiontypedialogtest COMMAND selectiontypedialogtest)
ecm_mark_as_test(selectiontypedialogtest)
target_link_libraries(selectiontypedialogtest Qt${QT_MAJOR_VERSION}::Test Qt${QT_MAJOR_VERSION}::Widgets KF5::I18n KF5::ItemViews pimdataexporterprivate KF5::ConfigCore KF5::ConfigGui KF5::PimCommonAkonadi)
target_link_libraries(selectiontypedialogtest Qt::Test Qt::Widgets KF5::I18n KF5::ItemViews pimdataexporterprivate KF5::ConfigCore KF5::ConfigGui KF5::PimCommonAkonadi)
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