Commit 0e945fba authored by Pino Toscano's avatar Pino Toscano

Merge branch 'Plasma/5.6'

parents be365be9 734b150c
......@@ -28,6 +28,7 @@
#include "docentrytraverser.h"
#include <KLocalizedString>
#include <ki18n_version.h>
using namespace KHC;
......@@ -146,7 +147,11 @@ 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;
......
......@@ -14,6 +14,7 @@
#include <KHTMLView>
#include <KToolBarPopupAction>
#include <KSharedConfig>
#include <ki18n_version.h>
#include <QFileInfo>
#include <QClipboard>
......@@ -96,7 +97,11 @@ 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