Commit 0a1b2d85 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

GIT_SILENT: Depend against kf5.85

parent 089012ae
......@@ -17,7 +17,7 @@ cmake_minimum_required (VERSION 3.16 FATAL_ERROR)
project(Filelight VERSION ${FILELIGHT_VERSION})
set(PROJECT_VERSION ${RELEASE_SERVICE_VERSION})
set(KF5_MIN_VERSION "5.83.0")
set(KF5_MIN_VERSION "5.85.0")
set(QT_REQUIRED_VERSION "5.15.0")
find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
......@@ -32,7 +32,7 @@ include(ECMSetupVersion)
include(FeatureSummary)
include(KDEInstallDirs)
include(KDECMakeSettings)
include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
include(KDECompilerSettings NO_POLICY_SCOPE)
include(ECMQtDeclareLoggingCategory)
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Core Widgets Svg)
......
......@@ -31,7 +31,6 @@
#include <KShortcutsDialog>
#include <KStandardAction>
#include <KUrlCompletion> //locationbar
#include <kxmlgui_version.h>
#include <QApplication> //setupActions()
#include <QDir>
......@@ -210,11 +209,7 @@ void MainWindow::configToolbars() //slot
void MainWindow::configKeys() //slot
{
#if KXMLGUI_VERSION < QT_VERSION_CHECK(5,84,0)
KShortcutsDialog::configure(actionCollection(), KShortcutsEditor::LetterShortcutsAllowed, this, true);
#else
KShortcutsDialog::showDialog(actionCollection(), KShortcutsEditor::LetterShortcutsAllowed, this);
#endif
}
void MainWindow::slotScanFolder()
......
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