From fc05d19a809f07ea682aa4d1dab6246d72a256b8 Mon Sep 17 00:00:00 2001 From: Aleix Pol Date: Sat, 26 Apr 2014 19:19:27 +0200 Subject: Adapt to changes in KDEInstallDirs kde5/services is kservices5 kde5/servicetypes is kservicestypes5 --- autotests/kdesktopfiletest.cpp | 4 ++-- src/core/kdesktopfile.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/autotests/kdesktopfiletest.cpp b/autotests/kdesktopfiletest.cpp index 08d9f142..494a43c0 100644 --- a/autotests/kdesktopfiletest.cpp +++ b/autotests/kdesktopfiletest.cpp @@ -122,14 +122,14 @@ void KDesktopFileTest::testIsAuthorizedDesktopFile() QVERIFY(QFile::exists(fileName)); QVERIFY(!KDesktopFile::isAuthorizedDesktopFile(fileName)); - const QString installedFile = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QLatin1String("/kde5/services/") + "http_cache_cleaner.desktop"); + const QString installedFile = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("/kservices5/http_cache_cleaner.desktop")); if (!installedFile.isEmpty()) { QVERIFY(KDesktopFile::isAuthorizedDesktopFile(installedFile)); } else { qWarning("Skipping test for http_cache_cleaner.desktop, not found. kio not installed?"); } - const QString autostartFile = QStandardPaths::locate(QStandardPaths::GenericConfigLocation, QLatin1String("autostart/") + "plasma-desktop.desktop"); + const QString autostartFile = QStandardPaths::locate(QStandardPaths::GenericConfigLocation, QStringLiteral("autostart/plasma-desktop.desktop")); if (!autostartFile.isEmpty()) { QVERIFY(KDesktopFile::isAuthorizedDesktopFile(autostartFile)); } else { diff --git a/src/core/kdesktopfile.cpp b/src/core/kdesktopfile.cpp index facd1ea0..6278309e 100644 --- a/src/core/kdesktopfile.cpp +++ b/src/core/kdesktopfile.cpp @@ -133,7 +133,7 @@ bool KDesktopFile::isAuthorizedDesktopFile(const QString &path) return true; } } - const QString servicesDir = QLatin1String("kde5/services/"); // KGlobal::dirs()->xdgDataRelativePath("services") + const QString servicesDir = QLatin1String("kservices5/"); // KGlobal::dirs()->xdgDataRelativePath("services") Q_FOREACH (const QString &xdgDataPrefix, QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation)) { if (QDir(xdgDataPrefix).exists()) { const QString prefix = QFileInfo(xdgDataPrefix).canonicalFilePath(); -- cgit v1.2.1