Commit 5818c059 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Make it compile without deprecated method

parent afac8e79
Pipeline #41229 canceled with stage
......@@ -139,7 +139,7 @@ include_directories(
add_definitions(-D_ASSUAN_ONLY_GPG_ERRORS)
#add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f00)
add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054C00)
add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054D00)
if(CMAKE_COMPILER_IS_GNUCXX)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-missing-braces -Wno-parentheses -Wno-ignored-qualifiers")
endif()
......
......@@ -8,7 +8,7 @@
*/
#include <config-kleopatra.h>
#include <kwidgetsaddons_version.h>
#include "mainwindow.h"
#include "aboutdata.h"
......@@ -465,7 +465,11 @@ void MainWindow::Private::setupActions()
clipboadMenu = new ClipboardMenu(q);
clipboadMenu->setMainWindow(q);
clipboadMenu->clipboardMenu()->setIcon(QIcon::fromTheme(QStringLiteral("edit-paste")));
#if KWIDGETSADDONS_VERSION >= QT_VERSION_CHECK(5, 77, 0)
clipboadMenu->clipboardMenu()->setPopupMode(QToolButton::InstantPopup);
#else
clipboadMenu->clipboardMenu()->setDelayed(false);
#endif
coll->addAction(QStringLiteral("clipboard_menu"), clipboadMenu->clipboardMenu());
q->setStandardToolBarMenuEnabled(true);
......
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