GIT_SILENT: time to increase dependancy

wilder
Laurent Montel 6 years ago
parent ec6e61ab93
commit 31fe9488e2
  1. 2
      CMakeLists.txt
  2. 13
      src/filter/mdnadvicedialog.cpp

@ -3,7 +3,7 @@ set(PIM_VERSION "5.15.43")
project(mailcommon VERSION ${PIM_VERSION}) 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) find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED)
set(CMAKE_MODULE_PATH ${mailcommon_SOURCE_DIR}/cmake/modules/ ${ECM_MODULE_PATH}) set(CMAKE_MODULE_PATH ${mailcommon_SOURCE_DIR}/cmake/modules/ ${ECM_MODULE_PATH})

@ -13,14 +13,7 @@
using MessageComposer::MessageFactoryNG; using MessageComposer::MessageFactoryNG;
#include <MessageViewer/MessageViewerSettings> #include <MessageViewer/MessageViewerSettings>
#include <kguiaddons_version.h>
#if KGUIADDONS_VERSION < QT_VERSION_CHECK(5, 73, 0)
#ifndef QT_NO_CURSOR
#include <Libkdepim/KCursorSaver>
#endif
#else
#include <KCursorSaver> #include <KCursorSaver>
#endif
#include <MimeTreeParser/ObjectTreeParser> #include <MimeTreeParser/ObjectTreeParser>
#include <ItemFetchJob> #include <ItemFetchJob>
@ -256,13 +249,7 @@ int MDNAdviceHelper::requestAdviceOnMDN(const char *what)
{ {
for (int i = 0; i < numMdnMessageBoxes; ++i) { for (int i = 0; i < numMdnMessageBoxes; ++i) {
if (!qstrcmp(what, mdnMessageBoxes[i].dontAskAgainID)) { 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); KCursorSaver saver(Qt::ArrowCursor);
#endif
MessageComposer::MDNAdvice answer; MessageComposer::MDNAdvice answer;
answer = questionIgnoreSend(i18n(mdnMessageBoxes[i].text), answer = questionIgnoreSend(i18n(mdnMessageBoxes[i].text),
mdnMessageBoxes[i].canDeny); mdnMessageBoxes[i].canDeny);

Loading…
Cancel
Save