Commit 3bfa63b8 authored by Luigi Toscano's avatar Luigi Toscano

Bump the minimum Frameworks to 5.20.0

It is old enough and it simplifies few requirements.
Bump the version number too.
parent d7136bde
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
......
......@@ -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;
......
......@@ -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"));
......
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