Commit 0b4ccd79 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Adapt build system for building against qt6

parent c096e40b
Pipeline #121309 passed with stage
in 13 minutes and 48 seconds
......@@ -13,7 +13,7 @@ macro(add_windowscontact_unittest _source _additional)
add_test(NAME ${_name} COMMAND ${_name} )
ecm_mark_as_test(${_name})
target_link_libraries( ${_name} Qt::Widgets Qt::Test KF5::I18n KF5::WidgetsAddons Qt::Xml KF5::Contacts)
target_link_libraries( ${_name} Qt${QT_MAJOR_VERSION}::Widgets Qt${QT_MAJOR_VERSION}::Test KF5::I18n KF5::WidgetsAddons Qt${QT_MAJOR_VERSION}::Xml KF5::Contacts)
endmacro ()
if (NOT WIN32)
add_windowscontact_unittest(importwindowcontacttest.cpp "../importwindowcontact.cpp")
......
......@@ -6,7 +6,7 @@ set(gravatarupdatedialog_gui_SRCS ${kaddressbook_checkgravatarplugin_test_SRCS}
add_executable(gravatarupdatedialog_gui ${gravatarupdatedialog_gui_SRCS})
ecm_mark_as_test(gravatarupdatedialog_gui)
target_link_libraries(gravatarupdatedialog_gui
Qt::Gui
Qt${QT_MAJOR_VERSION}::Gui
KF5::PimCommon
KF5::Gravatar
KF5::I18n
......
......@@ -59,7 +59,7 @@ endif()
target_link_libraries(kaddressbookmergelibprivate
PRIVATE
Qt::Network
Qt${QT_MAJOR_VERSION}::Network
KF5::I18n
KF5::Contacts
KF5::AkonadiContact
......
......@@ -16,7 +16,7 @@ macro( kaddressbook_merge _source _additional _additionallib)
add_executable( ${_name} ${_test} )
add_test(NAME ${_name} COMMAND ${_name} )
ecm_mark_as_test(kaddressbookmerge-${_name})
target_link_libraries( ${_name} kaddressbookmergelibprivate Qt::Test KF5::AkonadiCore KF5::Contacts ${_additionallib})
target_link_libraries( ${_name} kaddressbookmergelibprivate Qt${QT_MAJOR_VERSION}::Test KF5::AkonadiCore KF5::Contacts ${_additionallib})
endmacro()
kaddressbook_merge(mergecontactstest.cpp "../job/mergecontacts.cpp;../kaddressbookmergelibprivate_debug.cpp" "")
......@@ -47,5 +47,5 @@ set( kaddressbook_merge_mergecontactloseinformationwarning_source mergecontactlo
add_executable( mergecontactloseinformationwarningtest ${kaddressbook_merge_mergecontactloseinformationwarning_source})
add_test(NAME mergecontactloseinformationwarningtest COMMAND mergecontactloseinformationwarningtest)
ecm_mark_as_test(mergecontactloseinformationwarningtest)
target_link_libraries( mergecontactloseinformationwarningtest Qt::Test Qt::Gui kaddressbookmergelibprivate KF5::WidgetsAddons KF5::I18n)
target_link_libraries( mergecontactloseinformationwarningtest Qt${QT_MAJOR_VERSION}::Test Qt${QT_MAJOR_VERSION}::Gui kaddressbookmergelibprivate KF5::WidgetsAddons KF5::I18n)
......@@ -7,7 +7,7 @@ macro(add_kmail_checkbeforedeleting_unittest _source)
add_test(NAME ${_name} COMMAND ${_name} )
ecm_mark_as_test(kmail_checkbeforedeleting-${_name})
target_link_libraries( ${_name} Qt::Test KF5::XmlGui KF5::MessageViewer KF5::I18n kmailconfirmbeforedeleting)
target_link_libraries( ${_name} Qt${QT_MAJOR_VERSION}::Test KF5::XmlGui KF5::MessageViewer KF5::I18n kmailconfirmbeforedeleting)
endmacro ()
add_kmail_checkbeforedeleting_unittest(confirmbeforedeletingdialogtest.cpp)
......
......@@ -12,7 +12,7 @@ macro(add_kmail_converttext_unittest _source _additional)
add_test(NAME ${_name} COMMAND ${_name} )
ecm_mark_as_test(kmail_converttext-${_name})
target_link_libraries( ${_name} Qt::Test KF5::XmlGui KF5::MessageComposer KF5::I18n Qt::WebEngineWidgets discount::Lib KF5::SyntaxHighlighting kmailmarkdown)
target_link_libraries( ${_name} Qt${QT_MAJOR_VERSION}::Test KF5::XmlGui KF5::MessageComposer KF5::I18n Qt${QT_MAJOR_VERSION}::WebEngineWidgets discount::Lib KF5::SyntaxHighlighting kmailmarkdown)
endmacro ()
add_kmail_converttext_unittest(markdowninterfacetest.cpp "../plugin/markdowninterface.cpp")
......
......@@ -40,7 +40,7 @@ generate_export_header(kmailmarkdown BASE_NAME libkmailmarkdown)
target_link_libraries(kmailmarkdown
KF5::MessageComposer
KF5::I18n
Qt::WebEngineWidgets
Qt${QT_MAJOR_VERSION}::WebEngineWidgets
discount::Lib
KF5::SyntaxHighlighting
)
......
......@@ -4,6 +4,6 @@
set(markdown_gui_SRCS main.cpp markdowndemowidget.cpp markdown_gui.qrc)
add_executable(markdown_gui ${markdown_gui_SRCS})
target_link_libraries(markdown_gui
KF5::MessageComposer KF5::I18n KF5::XmlGui Qt::WebEngineWidgets discount::Lib KF5::SyntaxHighlighting kmailmarkdown
KF5::MessageComposer KF5::I18n KF5::XmlGui Qt${QT_MAJOR_VERSION}::WebEngineWidgets discount::Lib KF5::SyntaxHighlighting kmailmarkdown
)
......@@ -8,7 +8,7 @@ macro(add_kmail_externalcomposer_unittest _source _additional)
add_test(NAME ${_name} COMMAND ${_name} )
ecm_mark_as_test(kmail_editorinitplugin-${_name})
target_link_libraries( ${_name} Qt::Test KF5::MessageComposer KF5::I18n KF5::PimCommon KF5::KIOWidgets)
target_link_libraries( ${_name} Qt${QT_MAJOR_VERSION}::Test KF5::MessageComposer KF5::I18n KF5::PimCommon KF5::KIOWidgets)
endmacro ()
add_kmail_externalcomposer_unittest(externalcomposerconfigurewidgettest.cpp "../externalcomposerconfigurewidget.cpp")
......
......@@ -8,7 +8,7 @@ macro(add_kmail_editorplugin_unittest _source _additional)
add_test(NAME ${_name} COMMAND ${_name} )
ecm_mark_as_test(kmail_editorplugin-${_name})
target_link_libraries( ${_name} Qt::Test KF5::XmlGui KF5::MessageComposer KF5::I18n)
target_link_libraries( ${_name} Qt${QT_MAJOR_VERSION}::Test KF5::XmlGui KF5::MessageComposer KF5::I18n)
endmacro ()
add_kmail_editorplugin_unittest(autocorrectionplugineditortest.cpp "../autocorrectionplugineditor.cpp;../autocorrectionplugineditorinterface.cpp")
......
......@@ -11,7 +11,7 @@ macro(add_kmail_editorplugin_unittest _source _additional)
add_test(NAME ${_name} COMMAND ${_name} )
ecm_mark_as_test(kmail_editorplugin-${_name})
target_link_libraries( ${_name} Qt::Test KF5::XmlGui KF5::MessageComposer KF5::I18n)
target_link_libraries( ${_name} Qt${QT_MAJOR_VERSION}::Test KF5::XmlGui KF5::MessageComposer KF5::I18n)
endmacro ()
add_kmail_editorplugin_unittest(changecaseplugineditortest.cpp "../changecaseplugineditor.cpp;../changecaseplugineditorinterface.cpp")
......
......@@ -8,7 +8,7 @@ macro(add_kmail_editorplugin_unittest _source _additional)
add_test(NAME ${_name} COMMAND ${_name} )
ecm_mark_as_test(kmail_editorplugin-${_name})
target_link_libraries( ${_name} Qt::Test KF5::XmlGui KF5::MessageComposer KF5::I18n KF5::AkonadiContact)
target_link_libraries( ${_name} Qt${QT_MAJOR_VERSION}::Test KF5::XmlGui KF5::MessageComposer KF5::I18n KF5::AkonadiContact)
endmacro ()
add_kmail_editorplugin_unittest(insertemailplugineditortest.cpp
......
......@@ -19,7 +19,7 @@ endif()
target_link_libraries(shorturlpluginprivate
PRIVATE
Qt::Network KF5::I18n KF5::CoreAddons Qt::Gui
Qt${QT_MAJOR_VERSION}::Network KF5::I18n KF5::CoreAddons Qt${QT_MAJOR_VERSION}::Gui
)
set_target_properties(shorturlpluginprivate
......
......@@ -11,7 +11,7 @@ macro(add_kmail_editorplugin_unittest _source _additional)
add_test(NAME ${_name} COMMAND ${_name} )
ecm_mark_as_test(kmail_editorplugin-${_name})
target_link_libraries( ${_name} Qt::Test KF5::XmlGui KF5::MessageComposer KF5::I18n shorturlpluginprivate)
target_link_libraries( ${_name} Qt${QT_MAJOR_VERSION}::Test KF5::XmlGui KF5::MessageComposer KF5::I18n shorturlpluginprivate)
endmacro ()
......
......@@ -11,6 +11,6 @@ ecm_qt_declare_logging_category(pimcommon_isgdshorturlengineplugin HEADER isgdsh
target_link_libraries(pimcommon_isgdshorturlengineplugin
KF5::Service KF5::I18n Qt::Network KF5::CoreAddons shorturlpluginprivate Qt::Gui
KF5::Service KF5::I18n Qt${QT_MAJOR_VERSION}::Network KF5::CoreAddons shorturlpluginprivate Qt${QT_MAJOR_VERSION}::Gui
)
......@@ -8,6 +8,6 @@ kcoreaddons_add_plugin(pimcommon_tinyurlengineplugin SOURCES
target_link_libraries(pimcommon_tinyurlengineplugin
KF5::Service KF5::I18n Qt::Network KF5::CoreAddons shorturlpluginprivate Qt::Gui
KF5::Service KF5::I18n Qt${QT_MAJOR_VERSION}::Network KF5::CoreAddons shorturlpluginprivate Qt${QT_MAJOR_VERSION}::Gui
)
......@@ -7,6 +7,6 @@ kcoreaddons_add_plugin(pimcommon_triopabshorturlengineplugin SOURCES
${pimcommon_triopabshorturlengineplugin_SRCS} INSTALL_NAMESPACE pimcommon/shorturlengine)
target_link_libraries(pimcommon_triopabshorturlengineplugin
KF5::Service KF5::I18n Qt::Network KF5::CoreAddons shorturlpluginprivate Qt::Gui
KF5::Service KF5::I18n Qt${QT_MAJOR_VERSION}::Network KF5::CoreAddons shorturlpluginprivate Qt${QT_MAJOR_VERSION}::Gui
)
......@@ -9,6 +9,6 @@ kcoreaddons_add_plugin(pimcommon_ur1cashorturlengineplugin SOURCES
${pimcommon_ur1cashorturlengineplugin_SRCS} INSTALL_NAMESPACE pimcommon)
target_link_libraries(pimcommon_ur1cashorturlengineplugin
KF5::Service KF5::I18n Qt::Network KF5::CoreAddons shorturlpluginprivate Qt::Gui
KF5::Service KF5::I18n Qt${QT_MAJOR_VERSION}::Network KF5::CoreAddons shorturlpluginprivate Qt${QT_MAJOR_VERSION}::Gui
)
......@@ -7,7 +7,7 @@ macro(add_kmail_editorplugin_unittest _source _additional)
add_test(NAME ${_name} COMMAND ${_name} )
ecm_mark_as_test(kmail_editorplugin-${_name})
target_link_libraries( ${_name} Qt::Test KF5::XmlGui KF5::MessageComposer KF5::I18n)
target_link_libraries( ${_name} Qt${QT_MAJOR_VERSION}::Test KF5::XmlGui KF5::MessageComposer KF5::I18n)
endmacro ()
add_kmail_editorplugin_unittest(insertspecialcharacterplugineditortest.cpp "../insertspecialcharacterplugineditor.cpp;../insertspecialcharacterplugineditorinterface.cpp")
......
......@@ -8,7 +8,7 @@ macro(add_kmail_editorplugin_unittest _source _additional)
add_test(NAME ${_name} COMMAND ${_name} )
ecm_mark_as_test(kmail_editorplugin-${_name})
target_link_libraries( ${_name} Qt::Test KF5::XmlGui KF5::MessageComposer KF5::I18n)
target_link_libraries( ${_name} Qt${QT_MAJOR_VERSION}::Test KF5::XmlGui KF5::MessageComposer KF5::I18n)
endmacro ()
add_kmail_editorplugin_unittest(nonbreakingspaceplugineditortest.cpp "../nonbreakingspaceplugineditor.cpp;../nonbreakingspaceplugineditorinterface.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