X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.cpp;h=b7b1469dae588ab502157de7f483a032d30163c7;hp=7915c2331f5e76db150ed06c8fb055ea56b82c11;hb=56f70df273886f020699d296bcb7e3fbea237c09;hpb=446caa053a85a00ef1f2ed393b5a0da761d6f2d1 diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp index 7915c233..b7b1469d 100644 --- a/src/qtui/mainwin.cpp +++ b/src/qtui/mainwin.cpp @@ -41,6 +41,7 @@ #ifdef HAVE_KF5 # include # include +# include #endif #ifdef Q_WS_X11 @@ -145,7 +146,7 @@ #include "settingspages/notificationssettingspage.h" #include "settingspages/topicwidgetsettingspage.h" -#ifndef HAVE_KDE4 +#ifndef HAVE_KDE # include "settingspages/shortcutssettingspage.h" #endif @@ -1368,11 +1369,11 @@ void MainWin::showAboutDlg() void MainWin::showShortcutsDlg() { -#ifdef HAVE_KDE4 +#ifdef HAVE_KDE KShortcutsDialog dlg(KShortcutsEditor::AllActions, KShortcutsEditor::LetterShortcutsDisallowed, this); foreach(KActionCollection *coll, QtUi::actionCollections()) dlg.addCollection(coll, coll->property("Category").toString()); - dlg.exec(); + dlg.configure(true); #else SettingsPageDlg dlg(new ShortcutsSettingsPage(QtUi::actionCollections(), this), this); dlg.exec();