Commit 969b5f23 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

We depend against kf5.90/qt5.15

parent 5454660a
Pipeline #176747 passed with stage
in 1 minute and 50 seconds
......@@ -167,11 +167,7 @@ void KMixWindow::initActions()
_actionShowMenubar = KStandardAction::showMenubar(this, SLOT(toggleMenuBar()), actionCollection());
KStandardAction::preferences(this, SLOT(showSettings()), actionCollection());
#if KXMLGUI_VERSION >= QT_VERSION_CHECK(5, 84, 0)
KStandardAction::keyBindings(guiFactory(), &KXMLGUIFactory::showConfigureShortcutsDialog, actionCollection());
#else
KStandardAction::keyBindings(guiFactory(), SLOT(configureShortcuts()), actionCollection());
#endif
QAction* action = actionCollection()->addAction(QStringLiteral("launch_kdesoundsetup"));
action->setText(i18n("Audio Setup..."));
......
......@@ -649,11 +649,7 @@ void ProfControl::setSubcontrols(const QString &sctls)
_useSubcontrolCaptureSwitch = false;
_useSubcontrolEnum = false;
#if QT_VERSION>=QT_VERSION_CHECK(5, 14, 0)
QStringList qsl = sctls.split( ',', Qt::SkipEmptyParts, Qt::CaseInsensitive);
#else
QStringList qsl = sctls.split( ',', QString::SkipEmptyParts, Qt::CaseInsensitive);
#endif
QStringListIterator qslIt(qsl);
while (qslIt.hasNext()) {
......
Supports Markdown
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