Verified Commit c498da69 authored by Luca Beltrame's avatar Luca Beltrame
Browse files

Fix build with deprecated API disabled

parent d53003d9
Pipeline #66719 failed with stage
in 4 minutes and 51 seconds
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
#include <KShortcutsDialog> #include <KShortcutsDialog>
#include <QIcon> #include <QIcon>
#include <KConfigGroup> #include <KConfigGroup>
#include <kxmlgui_version.h>
#include <QEventLoop> #include <QEventLoop>
#include <QTextStream> #include <QTextStream>
...@@ -99,7 +100,11 @@ void KWatchGnuPGMainWindow::createActions() ...@@ -99,7 +100,11 @@ void KWatchGnuPGMainWindow::createActions()
void KWatchGnuPGMainWindow::configureShortcuts() void KWatchGnuPGMainWindow::configureShortcuts()
{ {
#if KXMLGUI_VERSION < QT_VERSION_CHECK(5,84,0)
KShortcutsDialog::configure(actionCollection(), KShortcutsEditor::LetterShortcutsAllowed, this); KShortcutsDialog::configure(actionCollection(), KShortcutsEditor::LetterShortcutsAllowed, this);
#else
KShortcutsDialog::showDialog(actionCollection(), KShortcutsEditor::LetterShortcutsAllowed, true /*isModal*/, this);
#endif
} }
void KWatchGnuPGMainWindow::slotConfigureToolbars() void KWatchGnuPGMainWindow::slotConfigureToolbars()
......
  • I would really appreciate if you would use MRs in the future. You can simply set the MRs to "merge automatically if build succeeds". FWIW, the build error introduced with this commit is not yet fixed because you didn't touch this file in your later commits.

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