Commit 98cc79d1 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

We depend against 5.84

parent 8f6cce19
Pipeline #73750 failed with stage
in 2 minutes and 40 seconds
......@@ -355,11 +355,7 @@ void MainWidget::configure()
QPointer<KCMultiDialog> dlg = new KCMultiDialog(this);
const QVector<KPluginMetaData> availablePlugins = KPluginLoader::findPlugins(QStringLiteral("pim/kcms/kaddressbook"));
for (const KPluginMetaData &metaData : availablePlugins) {
#if KCMUTILS_VERSION >= QT_VERSION_CHECK(5, 84, 0)
dlg->addModule(metaData);
#else
dlg->addModule(metaData.pluginId());
#endif
}
dlg->exec();
delete dlg;
......
......@@ -108,11 +108,7 @@ void MainWindow::configure()
void MainWindow::configureKeyBindings()
{
#if KXMLGUI_VERSION <= QT_VERSION_CHECK(5, 84, 0)
KShortcutsDialog *dlg = new KShortcutsDialog(KShortcutsEditor::AllActions, KShortcutsEditor::LetterShortcutsAllowed, this);
#else
KShortcutsDialog *dlg = new KShortcutsDialog(this);
#endif
dlg->setAttribute(Qt::WA_DeleteOnClose);
dlg->setModal(false);
dlg->addCollection(actionCollection());
......
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