From bc2881e37754bb1fc45ce8e6e1a0d6991e575d3e Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Thu, 8 Apr 2021 08:24:14 +0200 Subject: [PATCH] GIT_SILENT: increase to qt5.15, cmake 3.16.0, use Qt:: vs Qt5:: for helping to port to qt6 --- CMakeLists.txt | 18 ++++----- src/CMakeLists.txt | 2 +- src/collectionpage/autotests/CMakeLists.txt | 2 +- src/filter/autotests/CMakeLists.txt | 2 +- .../filteractionaddtoaddressbook.cpp | 4 -- src/filter/tests/CMakeLists.txt | 40 +++++++++---------- src/mdn/autotests/CMakeLists.txt | 2 +- src/search/autotests/CMakeLists.txt | 2 +- src/search/autotests/searchruledatetest.cpp | 4 -- src/snippets/autotests/CMakeLists.txt | 14 +++---- 10 files changed, 39 insertions(+), 51 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 36f2922..a3699bf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5 FATAL_ERROR) +cmake_minimum_required(VERSION 3.16 FATAL_ERROR) set(PIM_VERSION "5.17.40") project(mailcommon VERSION ${PIM_VERSION}) @@ -26,7 +26,7 @@ include(ECMQtDeclareLoggingCategory) include(ECMAddTests) -set(QT_REQUIRED_VERSION "5.14.0") +set(QT_REQUIRED_VERSION "5.15.0") set(MAILCOMMON_LIB_VERSION ${PIM_VERSION}) set(AKONADIMIME_LIB_VERSION "5.17.40") @@ -92,20 +92,16 @@ set_package_properties(Xsltproc PROPERTIES DESCRIPTION "XSLT processor from libx remove_definitions( -DQT_NO_CAST_FROM_ASCII ) option(KDEPIM_RUN_AKONADI_TEST "Enable autotest based on Akonadi." TRUE) -# Not supported yet -option(USE_UNITY_CMAKE_SUPPORT "Use UNITY cmake support (speedup compile time)" FALSE) +option(USE_UNITY_CMAKE_SUPPORT "Use UNITY cmake support (speedup compile time)" OFF) -set(COMPILE_WITH_UNITY_CMAKE_SUPPORT false) +set(COMPILE_WITH_UNITY_CMAKE_SUPPORT OFF) if (USE_UNITY_CMAKE_SUPPORT) - if(${CMAKE_VERSION} VERSION_LESS "3.16.0") - message(STATUS "CMAKE version is less than 3.16.0 . We can't use cmake unify build support") - else() - set(COMPILE_WITH_UNITY_CMAKE_SUPPORT true) - endif() + set(COMPILE_WITH_UNITY_CMAKE_SUPPORT ON) endif() + add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f00) -add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055100) +add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055200) set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD_REQUIRED ON) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c565b5a..f931332 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -268,7 +268,7 @@ PRIVATE KF5::ItemViews KF5::SyntaxHighlighting KF5::GuiAddons - Qt5::Xml + Qt::Xml ) diff --git a/src/collectionpage/autotests/CMakeLists.txt b/src/collectionpage/autotests/CMakeLists.txt index 5b38956..4c0a301 100644 --- a/src/collectionpage/autotests/CMakeLists.txt +++ b/src/collectionpage/autotests/CMakeLists.txt @@ -2,7 +2,7 @@ macro(add_mailcommon_collectionpage_test _name) ecm_add_test(${ARGN} TEST_NAME ${_name} NAME_PREFIX "mailcommon-collectionpage-" - LINK_LIBRARIES Qt5::Test Qt5::Gui KF5::AkonadiCore KF5::MailCommon KF5::Completion + LINK_LIBRARIES Qt::Test Qt5::Gui KF5::AkonadiCore KF5::MailCommon KF5::Completion ) endmacro() diff --git a/src/filter/autotests/CMakeLists.txt b/src/filter/autotests/CMakeLists.txt index 6e6a25e..93b0b1c 100644 --- a/src/filter/autotests/CMakeLists.txt +++ b/src/filter/autotests/CMakeLists.txt @@ -1,4 +1,4 @@ -set(mailcommon_filter_test_LIBS Qt5::Test Qt5::Gui KF5::AkonadiCore KF5::AkonadiMime +set(mailcommon_filter_test_LIBS Qt::Test Qt5::Gui KF5::AkonadiCore KF5::AkonadiMime KF5::MailCommon KF5::PimCommon Phonon::phonon4qt5 KF5::KIOWidgets KF5::IconThemes KF5::TemplateParser KF5::MailTransport KF5::I18n KF5::SyntaxHighlighting diff --git a/src/filter/filteractions/filteractionaddtoaddressbook.cpp b/src/filter/filteractions/filteractionaddtoaddressbook.cpp index 7c92862..c124e29 100644 --- a/src/filter/filteractions/filteractionaddtoaddressbook.cpp +++ b/src/filter/filteractions/filteractionaddtoaddressbook.cpp @@ -255,11 +255,7 @@ QString FilterActionAddToAddressBook::argsAsString() const void FilterActionAddToAddressBook::argsFromString(const QString &argsStr) { -#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) - const QStringList parts = argsStr.split(QLatin1Char('\t'), QString::KeepEmptyParts); -#else const QStringList parts = argsStr.split(QLatin1Char('\t'), Qt::KeepEmptyParts); -#endif const QString firstElement = parts[0]; if (firstElement == QLatin1String("From")) { mHeaderType = FromHeader; diff --git a/src/filter/tests/CMakeLists.txt b/src/filter/tests/CMakeLists.txt index 2388f8c..4515328 100644 --- a/src/filter/tests/CMakeLists.txt +++ b/src/filter/tests/CMakeLists.txt @@ -3,8 +3,8 @@ set(filterimporterexportergui_SRCS filterimporterexportergui.cpp) add_executable(filterimporterexportergui ${filterimporterexportergui_SRCS}) ecm_mark_as_test(filterimporterexportergui) target_link_libraries(filterimporterexportergui - Qt5::Core - Qt5::Gui + Qt::Core + Qt::Gui KF5::MailCommon KF5::I18n ) @@ -13,8 +13,8 @@ set(invalidfilterdialoggui_SRCS invalidfilterdialoggui.cpp) add_executable(invalidfilterdialoggui ${invalidfilterdialoggui_SRCS}) ecm_mark_as_test(invalidfilterdialoggui) target_link_libraries(invalidfilterdialoggui - Qt5::Core - Qt5::Gui + Qt::Core + Qt::Gui KF5::MailCommon KF5::I18n ) @@ -23,8 +23,8 @@ set(mndadvicedialoggui_SRCS mndadvicedialoggui.cpp) add_executable(mndadvicedialoggui ${mndadvicedialoggui_SRCS}) ecm_mark_as_test(mndadvicedialoggui) target_link_libraries(mndadvicedialoggui - Qt5::Core - Qt5::Gui + Qt::Core + Qt::Gui KF5::MailCommon KF5::I18n ) @@ -34,8 +34,8 @@ set(kmfilterdialogtestgui_SRCS kmfilterdialogtestgui.cpp ../../../autotests/dumm add_executable(kmfilterdialogtestgui ${kmfilterdialogtestgui_SRCS}) ecm_mark_as_test(kmfilterdialogtestgui) target_link_libraries(kmfilterdialogtestgui - Qt5::Core - Qt5::Gui + Qt::Core + Qt::Gui KF5::MailCommon KF5::I18n ) @@ -44,8 +44,8 @@ set(filteractionmissingsoundurldialogui_SRCS filteractionmissingsoundurldialogui add_executable(filteractionmissingsoundurldialogui ${filteractionmissingsoundurldialogui_SRCS}) ecm_mark_as_test(filteractionmissingsoundurldialogui) target_link_libraries(filteractionmissingsoundurldialogui - Qt5::Core - Qt5::Gui + Qt::Core + Qt::Gui KF5::MailCommon KF5::I18n KF5::KIOWidgets @@ -55,8 +55,8 @@ set(filteractionmissingtemplatedialoggui_SRCS filteractionmissingtemplatedialogg add_executable(filteractionmissingtemplatedialoggui ${filteractionmissingtemplatedialoggui_SRCS}) ecm_mark_as_test(filteractionmissingtemplatedialoggui) target_link_libraries(filteractionmissingtemplatedialoggui - Qt5::Core - Qt5::Gui + Qt::Core + Qt::Gui KF5::MailCommon KF5::I18n KF5::Completion @@ -66,8 +66,8 @@ set(filteractionmissingtransportdialoggui_SRCS filteractionmissingtransportdialo add_executable(filteractionmissingtransportdialoggui ${filteractionmissingtransportdialoggui_SRCS}) ecm_mark_as_test(filteractionmissingtransportdialoggui) target_link_libraries(filteractionmissingtransportdialoggui - Qt5::Core - Qt5::Gui + Qt::Core + Qt::Gui KF5::MailCommon KF5::I18n KF5::Completion @@ -78,8 +78,8 @@ set(filteractionmissingaccountdialoggui_SRCS filteractionmissingaccountdialoggui add_executable(filteractionmissingaccountdialoggui ${filteractionmissingaccountdialoggui_SRCS}) ecm_mark_as_test(filteractionmissingaccountdialoggui) target_link_libraries(filteractionmissingaccountdialoggui - Qt5::Core - Qt5::Gui + Qt::Core + Qt::Gui KF5::MailCommon KF5::I18n KF5::Completion @@ -89,8 +89,8 @@ set(filteractionmissingtagdialoggui_SRCS filteractionmissingtagdialoggui.cpp ../ add_executable(filteractionmissingtagdialoggui ${filteractionmissingtagdialoggui_SRCS}) ecm_mark_as_test(filteractionmissingtagdialoggui) target_link_libraries(filteractionmissingtagdialoggui - Qt5::Core - Qt5::Gui + Qt::Core + Qt::Gui KF5::MailCommon KF5::I18n KF5::Completion @@ -100,8 +100,8 @@ set(filteractionmissingidentitydialoggui_SRCS filteractionmissingidentitydialogg add_executable(filteractionmissingidentitydialoggui ${filteractionmissingidentitydialoggui_SRCS}) ecm_mark_as_test(filteractionmissingidentitydialoggui) target_link_libraries(filteractionmissingidentitydialoggui - Qt5::Core - Qt5::Gui + Qt::Core + Qt::Gui KF5::MailCommon KF5::I18n KF5::Completion diff --git a/src/mdn/autotests/CMakeLists.txt b/src/mdn/autotests/CMakeLists.txt index 2ce09da..e3a5a6c 100644 --- a/src/mdn/autotests/CMakeLists.txt +++ b/src/mdn/autotests/CMakeLists.txt @@ -1,5 +1,5 @@ ecm_add_test(mdnstateattributetest.cpp TEST_NAME mdnattributetest NAME_PREFIX "mailcommon-mdn-" - LINK_LIBRARIES Qt5::Test Qt5::Gui KF5::AkonadiCore KF5::MailCommon + LINK_LIBRARIES Qt::Test Qt5::Gui KF5::AkonadiCore KF5::MailCommon ) diff --git a/src/search/autotests/CMakeLists.txt b/src/search/autotests/CMakeLists.txt index ea97039..45f5ed7 100644 --- a/src/search/autotests/CMakeLists.txt +++ b/src/search/autotests/CMakeLists.txt @@ -2,7 +2,7 @@ macro(add_search_autotest _name) ecm_add_test(${ARGN} TEST_NAME ${_name} NAME_PREFIX "mailcommon-search-" - LINK_LIBRARIES Qt5::Test Qt5::Gui KF5::Mime KF5::AkonadiCore KF5::AkonadiMime KF5::MailCommon KF5::I18n + LINK_LIBRARIES Qt::Test Qt5::Gui KF5::Mime KF5::AkonadiCore KF5::AkonadiMime KF5::MailCommon KF5::I18n ) endmacro() diff --git a/src/search/autotests/searchruledatetest.cpp b/src/search/autotests/searchruledatetest.cpp index 7d9909b..4a1be60 100644 --- a/src/search/autotests/searchruledatetest.cpp +++ b/src/search/autotests/searchruledatetest.cpp @@ -75,11 +75,7 @@ void SearchRuleDateTest::shouldMatchDate() MailCommon::SearchRuleDate searchrule("", function, matchdate.toString(Qt::ISODate)); KMime::Message::Ptr msgPtr = KMime::Message::Ptr(new KMime::Message()); -#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) - msgPtr->date(true)->setDateTime(QDateTime(maildate)); -#else msgPtr->date(true)->setDateTime(QDateTime(maildate.startOfDay())); -#endif Akonadi::Item item; item.setPayload(msgPtr); diff --git a/src/snippets/autotests/CMakeLists.txt b/src/snippets/autotests/CMakeLists.txt index 155f9bd..2bc25b5 100644 --- a/src/snippets/autotests/CMakeLists.txt +++ b/src/snippets/autotests/CMakeLists.txt @@ -1,34 +1,34 @@ ecm_add_test(snippetsmanagertest.cpp NAME_PREFIX "mailcommon-snippets-" - LINK_LIBRARIES Qt5::Test Qt5::Gui KF5::MailCommon KF5::XmlGui + LINK_LIBRARIES Qt::Test Qt5::Gui KF5::MailCommon KF5::XmlGui ) ecm_add_test(snippetwidgettest.cpp NAME_PREFIX "mailcommon-snippets-" - LINK_LIBRARIES Qt5::Test Qt5::Gui KF5::MailCommon KF5::XmlGui + LINK_LIBRARIES Qt::Test Qt5::Gui KF5::MailCommon KF5::XmlGui ) ecm_add_test(snippetattachmentwidgettest.cpp NAME_PREFIX "mailcommon-snippets-" - LINK_LIBRARIES Qt5::Test Qt5::Gui KF5::MailCommon + LINK_LIBRARIES Qt::Test Qt5::Gui KF5::MailCommon ) ecm_add_test(snippetselectattachmentwidgettest.cpp NAME_PREFIX "mailcommon-snippets-" - LINK_LIBRARIES Qt5::Test Qt5::Gui KF5::MailCommon + LINK_LIBRARIES Qt::Test Qt5::Gui KF5::MailCommon ) ecm_add_test(snippetselectattachmentdialogtest.cpp NAME_PREFIX "mailcommon-snippets-" - LINK_LIBRARIES Qt5::Test Qt5::Gui KF5::MailCommon + LINK_LIBRARIES Qt::Test Qt5::Gui KF5::MailCommon ) ecm_add_test(snippetcustomfileattachmentnamedialogtest.cpp NAME_PREFIX "mailcommon-snippets-" - LINK_LIBRARIES Qt5::Test Qt5::Gui KF5::MailCommon + LINK_LIBRARIES Qt::Test Qt5::Gui KF5::MailCommon ) ecm_add_test(snippetcustomfileattachmentnamewidgettest.cpp NAME_PREFIX "mailcommon-snippets-" - LINK_LIBRARIES Qt5::Test Qt5::Gui KF5::MailCommon + LINK_LIBRARIES Qt::Test Qt5::Gui KF5::MailCommon )