Commit aa525f1a authored by Laurent Montel's avatar Laurent Montel 😁

Use new KCursorSaver from kguiaddons

parent 687d430a
Pipeline #28046 failed with stage
in 11 minutes and 25 seconds
......@@ -58,6 +58,7 @@ find_package(KF5WidgetsAddons ${KF5_MIN_VERSION} CONFIG REQUIRED)
find_package(KF5XmlGui ${KF5_MIN_VERSION} CONFIG REQUIRED)
find_package(KF5DBusAddons ${KF5_MIN_VERSION} CONFIG REQUIRED)
find_package(KF5SyntaxHighlighting ${KF5_MIN_VERSION} CONFIG REQUIRED)
find_package(KF5GuiAddons ${KF5_MIN_VERSION} CONFIG REQUIRED)
find_package(KF5Akonadi ${AKONADI_VERSION} CONFIG REQUIRED)
find_package(KF5AkonadiMime ${AKONADIMIME_LIB_VERSION} CONFIG REQUIRED)
......
......@@ -259,6 +259,7 @@ PRIVATE
KF5::Archive
KF5::ItemViews
KF5::SyntaxHighlighting
KF5::GuiAddons
Qt5::Xml
)
......
......@@ -25,9 +25,14 @@
using MessageComposer::MessageFactoryNG;
#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>
#endif
#include <MimeTreeParser/ObjectTreeParser>
#include <ItemFetchJob>
......@@ -263,8 +268,12 @@ 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),
......
Markdown is supported
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