Commit 2b7bd65a authored by Kurt Hindenburg's avatar Kurt Hindenburg
Browse files

Allow KF 5.68 to work

Ubuntu 20.04 LTS only has KF 5.68 and Qt 5.12 so let's allow those
to work for now.
parent c554e031
......@@ -11,7 +11,8 @@ cmake_minimum_required (VERSION 3.0 FATAL_ERROR)
# Qt 5.12 LTS EOL May 2021
set (QT_MIN_VERSION "5.12.0")
set (KF5_MIN_VERSION "5.69.0")
# Ubuntu 20.04 LTS only has KF 5.68 and Qt 5.12
set (KF5_MIN_VERSION "5.68.0")
# Release script will create bugzilla versions
project(konsole VERSION ${RELEASE_SERVICE_VERSION})
......
......@@ -53,9 +53,14 @@
#include <KConfigGroup>
#include <KCodecAction>
#include <KNotification>
#include <KIO/CommandLauncherJob>
#include <kio_version.h>
#if KIO_VERSION > QT_VERSION_CHECK(5, 68, 0)
#include <KIO/CommandLauncherJob>
#else
#include <KToolInvocation>
#endif
#if KIO_VERSION < QT_VERSION_CHECK(5, 71, 0)
#include <KRun>
#else
......@@ -555,8 +560,12 @@ void SessionController::handleWebShortcutAction()
void SessionController::configureWebShortcuts()
{
#if KIO_VERSION > QT_VERSION_CHECK(5, 68, 0)
auto job = new KIO::CommandLauncherJob(QStringLiteral("kcmshell5"), { QStringLiteral("webshortcuts") });
job->start();
#else
KToolInvocation::kdeinitExec(QStringLiteral("kcmshell5"), { QStringLiteral("webshortcuts") });
#endif
}
void SessionController::sendSignal(QAction* action)
......
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