From 31fe9488e226b4cee199e296cb54f1d006afd556 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Sat, 22 Aug 2020 14:05:10 +0200 Subject: [PATCH] GIT_SILENT: time to increase dependancy --- CMakeLists.txt | 2 +- src/filter/mdnadvicedialog.cpp | 13 ------------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9700af1..0d79770 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ set(PIM_VERSION "5.15.43") project(mailcommon VERSION ${PIM_VERSION}) -set(KF5_MIN_VERSION "5.72.0") +set(KF5_MIN_VERSION "5.73.0") find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${mailcommon_SOURCE_DIR}/cmake/modules/ ${ECM_MODULE_PATH}) diff --git a/src/filter/mdnadvicedialog.cpp b/src/filter/mdnadvicedialog.cpp index 26313c5..11b2c89 100644 --- a/src/filter/mdnadvicedialog.cpp +++ b/src/filter/mdnadvicedialog.cpp @@ -13,14 +13,7 @@ using MessageComposer::MessageFactoryNG; #include -#include -#if KGUIADDONS_VERSION < QT_VERSION_CHECK(5, 73, 0) -#ifndef QT_NO_CURSOR -#include -#endif -#else #include -#endif #include #include @@ -256,13 +249,7 @@ int MDNAdviceHelper::requestAdviceOnMDN(const char *what) { for (int i = 0; i < numMdnMessageBoxes; ++i) { if (!qstrcmp(what, mdnMessageBoxes[i].dontAskAgainID)) { -#if KGUIADDONS_VERSION < QT_VERSION_CHECK(5, 73, 0) -#ifndef QT_NO_CURSOR - const KPIM::KCursorSaver saver(Qt::ArrowCursor); -#endif -#else KCursorSaver saver(Qt::ArrowCursor); -#endif MessageComposer::MDNAdvice answer; answer = questionIgnoreSend(i18n(mdnMessageBoxes[i].text), mdnMessageBoxes[i].canDeny);