Commit 4de777e3 authored by Laurent Montel's avatar Laurent Montel
Browse files

Use Qt:: directly

parent e1b0a1c1
Pipeline #218921 passed with stage
in 11 minutes and 33 seconds
......@@ -2,4 +2,4 @@
# SPDX-License-Identifier: BSD-3-Clause
set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
ecm_add_tests( lexertest.cpp parsertest.cpp NAME_PREFIX "libksieve-parser-" LINK_LIBRARIES KF5::KSieve Qt${QT_MAJOR_VERSION}::Test)
ecm_add_tests( lexertest.cpp parsertest.cpp NAME_PREFIX "libksieve-parser-" LINK_LIBRARIES KF5::KSieve Qt::Test)
......@@ -34,7 +34,7 @@ generate_export_header(KF5KSieve BASE_NAME ksieve)
target_link_libraries(KF5KSieve
PRIVATE
Qt${QT_MAJOR_VERSION}::Core KF5::I18n
Qt::Core KF5::I18n
)
if (QT_MAJOR_VERSION STREQUAL "6")
......
......@@ -425,11 +425,11 @@ target_link_libraries(KF5KSieveUi
KF5::MailTransport
KF5::KIOWidgets
KF5::NewStuff
Qt${QT_MAJOR_VERSION}::WebEngineWidgets
Qt::WebEngineWidgets
KF5::PimTextEdit
KF5::I18n
KF5::SonnetUi
Qt${QT_MAJOR_VERSION}::PrintSupport
Qt::PrintSupport
KF5::SyntaxHighlighting
)
......
......@@ -16,7 +16,7 @@ macro(add_sieveeditor_autocreatescripts _source _extrasource)
ecm_add_test(${_test}
TEST_NAME ${_name}
NAME_PREFIX "sieveeditor-autocreatescripts-"
LINK_LIBRARIES Qt${QT_MAJOR_VERSION}::Test Qt${QT_MAJOR_VERSION}::Widgets KF5::I18n KF5::Completion KF5::ConfigCore KF5::KSieveUi KF5::MailTransport KF5::Libkdepim
LINK_LIBRARIES Qt::Test Qt::Widgets KF5::I18n KF5::Completion KF5::ConfigCore KF5::KSieveUi KF5::MailTransport KF5::Libkdepim
)
if (COMPILE_WITH_UNITY_CMAKE_SUPPORT)
set_target_properties(${_name} PROPERTIES UNITY_BUILD ON)
......
......@@ -6,7 +6,7 @@ set( libksieveui_sieveeditormenubartest_source sieveeditormenubartest.cpp sievee
add_executable( sieveeditormenubartest ${libksieveui_sieveeditormenubartest_source})
add_test(NAME sieveeditormenubartest COMMAND sieveeditormenubartest)
ecm_mark_as_test(sieveeditormenubartest)
target_link_libraries( sieveeditormenubartest KF5::KSieveUi KF5::KSieve Qt${QT_MAJOR_VERSION}::Test KF5::Completion KF5::PimCommon KF5::ConfigWidgets KF5::I18n KF5::PimTextEdit)
target_link_libraries( sieveeditormenubartest KF5::KSieveUi KF5::KSieve Qt::Test KF5::Completion KF5::PimCommon KF5::ConfigWidgets KF5::I18n KF5::PimTextEdit)
set_property(TARGET sieveeditormenubartest PROPERTY INCLUDE_DIRECTORIES ${CMAKE_SOURCE_DIR}/src/ksieveui/ ${CMAKE_SOURCE_DIR}/src/ksieveui/editor/webengine/ ${CMAKE_SOURCE_DIR}/src/ksieveui/editor/webengine/findbar ${CMAKE_BINARY_DIR}/src/ksieveui/)
......@@ -15,18 +15,18 @@ set( libksieveui_sievetextedittest_source sievetextedittest.cpp sievetextedittes
add_executable( sievetextedittest ${libksieveui_sievetextedittest_source})
add_test(NAME sievetextedittest COMMAND sievetextedittest)
ecm_mark_as_test(sievetextedittest)
target_link_libraries( sievetextedittest Qt${QT_MAJOR_VERSION}::Test Qt${QT_MAJOR_VERSION}::Gui KF5::KSieveUi KF5::PimCommon KF5::PimTextEdit Qt${QT_MAJOR_VERSION}::PrintSupport)
target_link_libraries( sievetextedittest Qt::Test Qt::Gui KF5::KSieveUi KF5::PimCommon KF5::PimTextEdit Qt::PrintSupport)
set( libksieveui_sievetexteditwidgettest_source sievetexteditwidgettest.cpp sievetexteditwidgettest.h)
add_executable( sievetexteditwidgettest ${libksieveui_sievetexteditwidgettest_source})
add_test(NAME sievetexteditwidgettest COMMAND sievetexteditwidgettest)
ecm_mark_as_test(sievetexteditwidgettest)
target_link_libraries( sievetexteditwidgettest Qt${QT_MAJOR_VERSION}::Test Qt${QT_MAJOR_VERSION}::Gui KF5::KSieveUi KF5::PimCommon KF5::PimTextEdit Qt${QT_MAJOR_VERSION}::PrintSupport)
target_link_libraries( sievetexteditwidgettest Qt::Test Qt::Gui KF5::KSieveUi KF5::PimCommon KF5::PimTextEdit Qt::PrintSupport)
set( libksieveui_sieveinfodialogtest_source sieveinfodialogtest.cpp sieveinfodialogtest.h)
add_executable( sieveinfodialogtest ${libksieveui_sieveinfodialogtest_source})
add_test(NAME sieveinfodialogtest COMMAND sieveinfodialogtest)
ecm_mark_as_test(sieveinfodialogtest)
target_link_libraries( sieveinfodialogtest Qt${QT_MAJOR_VERSION}::Test KF5::KSieveUi )
target_link_libraries( sieveinfodialogtest Qt::Test KF5::KSieveUi )
......@@ -12,7 +12,7 @@ target_link_libraries(editorsieve_gui
KF5::KSieveUi
KF5::PimCommon
KF5::I18n
Qt${QT_MAJOR_VERSION}::PrintSupport
Qt::PrintSupport
KF5::SyntaxHighlighting
)
......@@ -6,8 +6,8 @@ target_sources(sieveeditorhelphtmlwidgettest PRIVATE sieveeditorhelphtmlwidgette
add_test(NAME sieveeditorhelphtmlwidgettest COMMAND sieveeditorhelphtmlwidgettest)
ecm_mark_as_test(sieveeditorhelphtmlwidgettest)
target_link_libraries( sieveeditorhelphtmlwidgettest
Qt${QT_MAJOR_VERSION}::Test
KF5::Completion KF5::PimCommon KF5::IconThemes Qt${QT_MAJOR_VERSION}::Gui Qt${QT_MAJOR_VERSION}::Widgets KF5::ConfigWidgets KF5::I18n KF5::PimTextEdit Qt${QT_MAJOR_VERSION}::WebEngineWidgets KF5::KSieveUi)
Qt::Test
KF5::Completion KF5::PimCommon KF5::IconThemes Qt::Gui Qt::Widgets KF5::ConfigWidgets KF5::I18n KF5::PimTextEdit Qt::WebEngineWidgets KF5::KSieveUi)
set_property(TARGET sieveeditorhelphtmlwidgettest PROPERTY INCLUDE_DIRECTORIES ${CMAKE_SOURCE_DIR}/src/ksieveui/editor/webengine/ ${CMAKE_SOURCE_DIR}/src/ksieveui/editor/webengine/findbar ${CMAKE_BINARY_DIR}/src/ksieveui/)
# needed for the CI to run webengine-related tests
# the CI runs as root, and webengine insists on disabling sandboxing in that case
......
......@@ -3,6 +3,6 @@
ecm_add_test(findbarbasetest.cpp findbarbasetest.h
TEST_NAME findbarbasetest
NAME_PREFIX "libksieveui-findbar-"
LINK_LIBRARIES Qt${QT_MAJOR_VERSION}::Test Qt${QT_MAJOR_VERSION}::Widgets Qt${QT_MAJOR_VERSION}::Gui KF5::Completion KF5::I18n KF5::ConfigWidgets KF5::PimCommon KF5::KSieveUi
LINK_LIBRARIES Qt::Test Qt::Widgets Qt::Gui KF5::Completion KF5::I18n KF5::ConfigWidgets KF5::PimCommon KF5::KSieveUi
)
set_property(TARGET findbarbasetest PROPERTY INCLUDE_DIRECTORIES ${CMAKE_SOURCE_DIR}/src/ksieveui/editor/webengine/findbar ${CMAKE_BINARY_DIR}/src/ksieveui/)
......@@ -8,7 +8,7 @@ macro( add_managesievejob_test _source )
add_executable( ${_name} ${_test} ${_name}.h)
add_test(NAME ${_name} COMMAND ${_name})
ecm_mark_as_test(managejob-${_name})
target_link_libraries( ${_name} KF5::KSieveUi Qt${QT_MAJOR_VERSION}::Test )
target_link_libraries( ${_name} KF5::KSieveUi Qt::Test )
endmacro()
......
......@@ -9,7 +9,7 @@ macro(add_sieveeditor_xmlprintingscriptbuilding _source)
ecm_add_test(${_test}
TEST_NAME ${_name}
NAME_PREFIX "sieveeditor-xmlprintingscriptbuilding-"
LINK_LIBRARIES Qt${QT_MAJOR_VERSION}::Test KF5::I18n KF5::KSieveUi
LINK_LIBRARIES Qt::Test KF5::I18n KF5::KSieveUi
)
target_compile_definitions(${_name} PRIVATE XMLPRINTINGSCRIPTBUILDER_DATA_DIR="${CMAKE_CURRENT_SOURCE_DIR}/data")
target_compile_definitions(${_name} PRIVATE XMLPRINTINGSCRIPTBUILDER_GENERATED_DATA_DIR="${CMAKE_CURRENT_BINARY_DIR}/data")
......
......@@ -9,7 +9,7 @@ macro( add_sieveimapinstance_test _source)
add_executable( ${_name} ${_test} ${_name}.h)
add_test(NAME ${_name} COMMAND ${_name})
ecm_mark_as_test(sieveimapinstancetest-${_name})
target_link_libraries( ${_name} KF5::KSieveUi Qt${QT_MAJOR_VERSION}::Test)
target_link_libraries( ${_name} KF5::KSieveUi Qt::Test)
endmacro()
......
......@@ -8,7 +8,7 @@ macro( add_sievescriptdebugger_test _source )
add_executable( ${_name} ${_test} ${_name}.h )
add_test(NAME ${_name} COMMAND ${_name})
ecm_mark_as_test(sievescriptdebugger-${_name})
target_link_libraries( ${_name} KF5::KSieveUi Qt${QT_MAJOR_VERSION}::Test KF5::Completion KF5::KIOWidgets KF5::PimTextEdit)
target_link_libraries( ${_name} KF5::KSieveUi Qt::Test KF5::Completion KF5::KIOWidgets KF5::PimTextEdit)
endmacro()
......
......@@ -6,7 +6,7 @@ macro(add_sieveutil_test _source _additionalsource)
add_executable( ${_name} ${_test} ${_name}.h)
add_test(NAME ${_name} COMMAND ${_name})
ecm_mark_as_test(sievescriptdebugger-${_name})
target_link_libraries( ${_name} KF5::KSieveUi Qt${QT_MAJOR_VERSION}::Test KF5::MailTransport KF5::I18n)
target_link_libraries( ${_name} KF5::KSieveUi Qt::Test KF5::MailTransport KF5::I18n)
endmacro()
add_sieveutil_test(sieveaccounttest.cpp "")
......
......@@ -20,7 +20,7 @@ macro( add_vacation_test _source )
add_definitions(-DVACATIONTESTDATADIR="${CMAKE_CURRENT_SOURCE_DIR}/data/")
target_link_libraries(${_name}
KF5::KSieveUi
Qt${QT_MAJOR_VERSION}::Test
Qt::Test
KF5::IdentityManagement
KF5::Mime
KF5::I18n
......
......@@ -6,7 +6,7 @@ macro(add_autocreatescriptswidget_test _source)
add_executable( ${_name} ${_test} ${_name}.h)
add_test(NAME ${_name} COMMAND ${_name})
ecm_mark_as_test(sievescriptdebugger-${_name})
target_link_libraries( ${_name} KF5::KSieveUi Qt${QT_MAJOR_VERSION}::Test KF5::I18n)
target_link_libraries( ${_name} KF5::KSieveUi Qt::Test KF5::I18n)
endmacro()
add_autocreatescriptswidget_test(lineeditvalidatortest.cpp)
......
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