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

Use Qt:: directly

parent 55859b9a
Pipeline #218878 passed with stage
in 17 minutes and 25 seconds
......@@ -23,8 +23,8 @@ function(add_akonadi_isolated_test)
add_executable(${_name} ${_test} ${CONFIG_ADDITIONAL_SOURCES})
ecm_mark_as_test(${_name})
target_link_libraries(${_name}
Qt${QT_MAJOR_VERSION}::Test Qt${QT_MAJOR_VERSION}::Gui Qt${QT_MAJOR_VERSION}::Widgets Qt${QT_MAJOR_VERSION}::Network KF5::KIOCore
KF5::AkonadiCore KF5::AkonadiPrivate Qt${QT_MAJOR_VERSION}::DBus
Qt::Test Qt::Gui Qt::Widgets Qt::Network KF5::KIOCore
KF5::AkonadiCore KF5::AkonadiPrivate Qt::DBus
${CONFIG_LINK_LIBRARIES}
)
......
......@@ -22,7 +22,7 @@ macro(add_akonadi_test _source)
get_filename_component(_name ${_source} NAME_WE)
ecm_add_test(TEST_NAME ${_name} ${_test})
set_tests_properties(${_name} PROPERTIES ENVIRONMENT "QT_HASH_SEED=1;QT_NO_CPU_FEATURE=sse4.2")
target_link_libraries(${_name} akonaditestfake Qt${QT_MAJOR_VERSION}::Test KF5::AkonadiPrivate KF5::I18n)
target_link_libraries(${_name} akonaditestfake Qt::Test KF5::AkonadiPrivate KF5::I18n)
endmacro()
# convenience macro to add akonadi qtestlib unit-tests
......@@ -35,7 +35,7 @@ macro(add_akonadi_test_widgets _source)
get_filename_component(_name ${_source} NAME_WE)
ecm_add_test(TEST_NAME ${_name} ${_test})
set_tests_properties(${_name} PROPERTIES ENVIRONMENT "QT_HASH_SEED=1;QT_NO_CPU_FEATURE=sse4.2")
target_link_libraries(${_name} akonaditestfake Qt${QT_MAJOR_VERSION}::Test KF5::AkonadiWidgets KF5::AkonadiPrivate)
target_link_libraries(${_name} akonaditestfake Qt::Test KF5::AkonadiWidgets KF5::AkonadiPrivate)
endmacro()
include(../KF5AkonadiMacros.cmake)
......
......@@ -18,7 +18,7 @@ macro(add_unit_test _source)
target_link_libraries(${_name}
akonadi_shared
KF5AkonadiPrivate
Qt${QT_MAJOR_VERSION}::Test
Qt::Test
KF5::ConfigCore
${CMAKE_EXE_LINKER_FLAGS_ASAN}
)
......
......@@ -26,11 +26,11 @@ add_library(akonaditestfake SHARED
generate_export_header(akonaditestfake BASE_NAME akonaditestfake)
target_link_libraries(akonaditestfake
Qt${QT_MAJOR_VERSION}::DBus
Qt::DBus
KF5::AkonadiCore
Qt${QT_MAJOR_VERSION}::Test
Qt${QT_MAJOR_VERSION}::Widgets
Qt${QT_MAJOR_VERSION}::Network
Qt::Test
Qt::Widgets
Qt::Network
KF5::AkonadiPrivate
akonadi_shared
)
......@@ -40,7 +40,7 @@ add_executable(akonadi-firstrun
firstrunner.cpp
${CMAKE_BINARY_DIR}/src/core/akonadicore_debug.cpp
)
target_link_libraries( akonadi-firstrun Qt${QT_MAJOR_VERSION}::Test Qt${QT_MAJOR_VERSION}::Core KF5::AkonadiCore KF5::AkonadiPrivate KF5::ConfigCore Qt${QT_MAJOR_VERSION}::Widgets)
target_link_libraries( akonadi-firstrun Qt::Test Qt::Core KF5::AkonadiCore KF5::AkonadiPrivate KF5::ConfigCore Qt::Widgets)
add_akonadi_test(itemhydratest.cpp)
add_akonadi_test(itemtest.cpp)
......@@ -69,7 +69,7 @@ add_akonadi_test(cachepolicytest.cpp)
#add_executable( resourceschedulertest resourceschedulertest.cpp ../src/agentbase/resourcescheduler.cpp )
#add_test( resourceschedulertest resourceschedulertest )
#ecm_mark_as_test(akonadi-resourceschedulertest)
#target_link_libraries(resourceschedulertest Qt${QT_MAJOR_VERSION}::Test KF5::AkonadiAgentBase)
#target_link_libraries(resourceschedulertest Qt::Test KF5::AkonadiAgentBase)
# testrunner tests
......
......@@ -29,7 +29,7 @@ target_link_libraries(akonadi_knut_resource
KF5::AkonadiCore
KF5::KIOCore
KF5::AkonadiAgentBase
Qt${QT_MAJOR_VERSION}::Xml
Qt::Xml
KF5::I18n
)
......
......@@ -17,9 +17,9 @@ target_link_libraries(akonaditest
KF5::AkonadiCore
KF5::I18n
KF5::ConfigCore
Qt${QT_MAJOR_VERSION}::Xml
Qt${QT_MAJOR_VERSION}::DBus
Qt${QT_MAJOR_VERSION}::Widgets
Qt::Xml
Qt::DBus
Qt::Widgets
)
install(TARGETS akonaditest ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
......
......@@ -12,9 +12,9 @@ macro(add_unit_test _source)
target_link_libraries(${_name}
akonadi_shared
KF5AkonadiPrivate
Qt${QT_MAJOR_VERSION}::Network
Qt${QT_MAJOR_VERSION}::Widgets
Qt${QT_MAJOR_VERSION}::Test
Qt::Network
Qt::Widgets
Qt::Test
${CMAKE_EXE_LINKER_FLAGS_ASAN}
)
endmacro()
......
......@@ -47,11 +47,11 @@ target_sources(akonadi_unittest_common PRIVATE
target_link_libraries(akonadi_unittest_common
KF5AkonadiPrivate
libakonadiserver
Qt${QT_MAJOR_VERSION}::Core
Qt${QT_MAJOR_VERSION}::DBus
Qt${QT_MAJOR_VERSION}::Test
Qt${QT_MAJOR_VERSION}::Sql
Qt${QT_MAJOR_VERSION}::Network
Qt::Core
Qt::DBus
Qt::Test
Qt::Sql
Qt::Network
)
macro(add_server_test _source)
......@@ -71,11 +71,11 @@ macro(add_server_test _source)
akonadi_unittest_common
libakonadiserver
KF5AkonadiPrivate
Qt${QT_MAJOR_VERSION}::Core
Qt${QT_MAJOR_VERSION}::DBus
Qt${QT_MAJOR_VERSION}::Test
Qt${QT_MAJOR_VERSION}::Sql
Qt${QT_MAJOR_VERSION}::Network
Qt::Core
Qt::DBus
Qt::Test
Qt::Sql
Qt::Network
${CMAKE_SHARED_LINKER_FLAGS_ASAN}
)
endmacro()
......
......@@ -11,7 +11,7 @@ macro(add_unit_test _source)
endif()
target_link_libraries(${_name}
akonadi_shared
Qt${QT_MAJOR_VERSION}::Test
Qt::Test
${CMAKE_EXE_LINKER_FLAGS_ASAN}
)
endmacro()
......
......@@ -80,8 +80,8 @@ target_include_directories(KF5AkonadiAgentBase INTERFACE "$<INSTALL_INTERFACE:${
target_link_libraries(KF5AkonadiAgentBase
PUBLIC
Qt${QT_MAJOR_VERSION}::DBus
Qt${QT_MAJOR_VERSION}::Widgets # for QApplication
Qt::DBus
Qt::Widgets # for QApplication
KF5::AkonadiCore
KF5::ConfigCore
KF5::ConfigGui # for KConfigSkeleton
......@@ -89,7 +89,7 @@ PRIVATE
KF5::AkonadiPrivate
KF5::AkonadiWidgets
KF5::I18n
Qt${QT_MAJOR_VERSION}::Network
Qt::Network
akonadi_shared
)
......
......@@ -26,8 +26,8 @@ set_target_properties(akonadi_agent_server PROPERTIES MACOSX_BUNDLE FALSE)
target_link_libraries(akonadi_agent_server
akonadi_shared
KF5AkonadiPrivate
Qt${QT_MAJOR_VERSION}::Core
Qt${QT_MAJOR_VERSION}::DBus
Qt::Core
Qt::DBus
)
# Agent plugin launcher
......@@ -48,8 +48,8 @@ set_target_properties(akonadi_agent_launcher PROPERTIES MACOSX_BUNDLE FALSE)
target_link_libraries(akonadi_agent_launcher
akonadi_shared
KF5AkonadiPrivate
Qt${QT_MAJOR_VERSION}::Core
Qt${QT_MAJOR_VERSION}::Widgets
Qt::Core
Qt::Widgets
)
# Install both helper apps.
......
......@@ -65,15 +65,15 @@ target_link_libraries(akonadi_control
KF5AkonadiPrivate
KF5::CoreAddons
KF5::ConfigCore
Qt${QT_MAJOR_VERSION}::Core
Qt${QT_MAJOR_VERSION}::DBus
Qt${QT_MAJOR_VERSION}::Gui
Qt::Core
Qt::DBus
Qt::Gui
)
if (WITH_ACCOUNTS)
target_include_directories(akonadi_control PRIVATE ${ACCOUNTSQT_INCLUDE_DIRS})
# We need Qt::Xml because the Accounts framework leaks QDocument includes into public interface
target_link_libraries(akonadi_control ${ACCOUNTSQT_LIBRARIES} Qt${QT_MAJOR_VERSION}::Xml)
target_link_libraries(akonadi_control ${ACCOUNTSQT_LIBRARIES} Qt::Xml)
endif()
install(TARGETS akonadi_control
......
......@@ -30,8 +30,8 @@ target_link_libraries(akonadictl
akonadi_shared
KF5AkonadiPrivate
KF5::CoreAddons
Qt${QT_MAJOR_VERSION}::Core
Qt${QT_MAJOR_VERSION}::DBus
Qt::Core
Qt::DBus
)
install(TARGETS akonadictl
......
......@@ -9,8 +9,8 @@ set_target_properties(asapcat PROPERTIES MACOSX_BUNDLE FALSE)
target_link_libraries(asapcat
akonadi_shared
KF5AkonadiPrivate
Qt${QT_MAJOR_VERSION}::Core
Qt${QT_MAJOR_VERSION}::Network
Qt::Core
Qt::Network
)
install(TARGETS asapcat
......
......@@ -438,10 +438,10 @@ target_link_libraries(KF5AkonadiCore
PUBLIC
KF5::CoreAddons # for KJob
KF5::ItemModels
Qt${QT_MAJOR_VERSION}::Gui # for QColor
Qt::Gui # for QColor
PRIVATE
Qt${QT_MAJOR_VERSION}::Network
Qt${QT_MAJOR_VERSION}::Widgets
Qt::Network
Qt::Widgets
KF5::AkonadiPrivate
KF5::KIOCore
KF5::I18n
......
......@@ -53,10 +53,10 @@ add_library(KF5::AkonadiPrivate ALIAS KF5AkonadiPrivate)
add_dependencies(KF5AkonadiPrivate generate_protocol)
target_link_libraries(KF5AkonadiPrivate
PUBLIC
Qt${QT_MAJOR_VERSION}::Core
Qt${QT_MAJOR_VERSION}::DBus
Qt::Core
Qt::DBus
PRIVATE
Qt${QT_MAJOR_VERSION}::Network
Qt::Network
LibLZMA::LibLZMA
)
generate_export_header(KF5AkonadiPrivate BASE_NAME akonadiprivate)
......
......@@ -17,5 +17,5 @@ target_sources(protocolgen PRIVATE
set_target_properties(protocolgen PROPERTIES MACOSX_BUNDLE FALSE)
target_link_libraries(protocolgen
Qt${QT_MAJOR_VERSION}::Core
Qt::Core
)
......@@ -19,8 +19,8 @@ add_library(qsqlite3 SHARED ${QSqlite_SRCS} ${QSqlite_MOC_SRCS})
set_target_properties(qsqlite3 PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/sqldrivers")
target_link_libraries(qsqlite3
Qt${QT_MAJOR_VERSION}::Core
Qt${QT_MAJOR_VERSION}::Sql
Qt::Core
Qt::Sql
Sqlite::Sqlite
)
......
......@@ -14,8 +14,8 @@ set_target_properties(akonadi_rds PROPERTIES MACOSX_BUNDLE FALSE)
target_link_libraries(akonadi_rds
akonadi_shared
KF5AkonadiPrivate
Qt${QT_MAJOR_VERSION}::Core
Qt${QT_MAJOR_VERSION}::Network
Qt::Core
Qt::Network
)
install(TARGETS akonadi_rds
......
......@@ -5,8 +5,8 @@ PRIVATE
KF5::AkonadiWidgets
KF5::AkonadiPrivate
KF5::I18n
Qt${QT_MAJOR_VERSION}::Sql
Qt${QT_MAJOR_VERSION}::Widgets
Qt::Sql
Qt::Widgets
)
install(TARGETS
......
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