summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuigi Toscano <[email protected]>2017-07-09 22:06:15 +0200
committerLuigi Toscano <[email protected]>2017-07-09 22:06:15 +0200
commit3bfa63b8f20313f7b67a257372d14241743dfb0f (patch)
treea979c596deb456c961ca92d95c4a0ba25ee71e99
parentd7136bde8447006b5282694ec301d28d6d32cdb4 (diff)
Bump the minimum Frameworks to 5.20.0
It is old enough and it simplifies few requirements. Bump the version number too.
-rw-r--r--CMakeLists.txt7
-rw-r--r--docmetainfo.cpp4
-rw-r--r--view.cpp4
3 files changed, 4 insertions, 11 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 11982d0..b54da31 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,10 +1,11 @@
project(KHelpCenter)
-set(PROJECT_VERSION "5.7.2")
+set(PROJECT_VERSION "5.7.3")
cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
set(QT_MIN_VERSION "5.4.0")
-find_package(ECM 1.3.0 REQUIRED NO_MODULE)
+set(KF5_MIN_VERSION "5.20.0")
+find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
include(KDEInstallDirs)
@@ -23,7 +24,7 @@ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS
Xml
)
-find_package(KF5 REQUIRED COMPONENTS
+find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
Archive
Bookmarks
Config
diff --git a/docmetainfo.cpp b/docmetainfo.cpp
index 16adfc5..6663d06 100644
--- a/docmetainfo.cpp
+++ b/docmetainfo.cpp
@@ -148,11 +148,7 @@ void DocMetaInfo::scanMetaInfo( bool force )
{
if ( mLoaded && !force ) return;
-#if KI18N_VERSION >= QT_VERSION_CHECK(5, 20, 0)
mLanguages = KLocalizedString::languages();
-#else
- mLanguages = QLocale().uiLanguages();
-#endif
QStringList::ConstIterator it;
diff --git a/view.cpp b/view.cpp
index 801270c..f4f65bc 100644
--- a/view.cpp
+++ b/view.cpp
@@ -97,11 +97,7 @@ QString View::langLookup( const QString &fname )
// assemble the local search paths
const QStringList localDoc = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("doc/HTML"), QStandardPaths::LocateDirectory);
-#if KI18N_VERSION >= QT_VERSION_CHECK(5, 20, 0)
QStringList langs = KLocalizedString::languages();
-#else
- QStringList langs = QLocale().uiLanguages();
-#endif
langs.append(QStringLiteral("en"));
langs.removeAll(QStringLiteral("C"));