Commit 6e5e786f authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Make it compile without deprecated method

parent e23df8f4
Pipeline #41234 canceled with stage
in 14 minutes and 40 seconds
......@@ -145,7 +145,7 @@ endif()
find_package(Gpgmepp 1.11.1 CONFIG)
set_package_properties(Gpgmepp PROPERTIES DESCRIPTION "GpgME library" URL "https://www.gnupg.org" TYPE REQUIRED)
add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050e00)
add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054C00)
add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054D00)
add_definitions(-DQT_NO_FOREACH)
add_definitions(-DQT_NO_KEYWORDS)
......
......@@ -6,6 +6,7 @@
#include "sharetextplugineditorinterface.h"
#include "sharetexteditorplugin_debug.h"
#include <kwidgetsaddons_version.h>
#include "sharetextpurposemenuwidget.h"
#include <KPIMTextEdit/EditorUtil>
#include <KPIMTextEdit/RichTextEditor>
......@@ -31,7 +32,11 @@ void ShareTextPluginEditorInterface::createAction(KActionCollection *ac)
KActionMenu *shareAction = new KActionMenu(i18n("Share Mail Text..."), this);
shareAction->setMenu(purposeMenu->menu());
shareAction->setIcon(QIcon::fromTheme(QStringLiteral("document-share")));
#if KWIDGETSADDONS_VERSION >= QT_VERSION_CHECK(5, 77, 0)
shareAction->setPopupMode(QToolButton::InstantPopup);
#else
shareAction->setDelayed(false);
#endif
ac->addAction(QStringLiteral("share_text_menu"), shareAction);
purposeMenu->setEditorWidget(this);
MessageComposer::PluginActionType type(shareAction, MessageComposer::PluginActionType::File);
......
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