...
 
Commits (514)

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

...@@ -28,3 +28,5 @@ GSYMS ...@@ -28,3 +28,5 @@ GSYMS
BROWSE BROWSE
*.kate-swp *.kate-swp
/po/ /po/
build_dir
.flatpak-builder
...@@ -12,14 +12,15 @@ SET(EXTPREFIX_frameworks "${EXTPREFIX}" ) ...@@ -12,14 +12,15 @@ SET(EXTPREFIX_frameworks "${EXTPREFIX}" )
# ItemModels # ItemModels
# ItemViews # ItemViews
# WindowSystem # WindowSystem
# kimageformats
# On Linux: # On Linux:
# KCrash # KCrash
ExternalProject_Add( ExternalProject_Add(
ext_extra_cmake_modules ext_extra_cmake_modules
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR} DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://download.kde.org/stable/frameworks/5.44/extra-cmake-modules-5.44.0.zip URL http://download.kde.org/stable/frameworks/5.60/extra-cmake-modules-5.60.0.zip
URL_MD5 74aa8fc501e27024390b01c81f2925eb URL_MD5 c205e17d89028ab0b034e68081d5ebfb
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/ecm_install_to_share.diff PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/ecm_install_to_share.diff
INSTALL_DIR ${EXTPREFIX_frameworks} INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks} CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
...@@ -34,8 +35,8 @@ ExternalProject_Add( ...@@ -34,8 +35,8 @@ ExternalProject_Add(
ExternalProject_Add( ExternalProject_Add(
ext_karchive ext_karchive
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR} DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://download.kde.org/stable/frameworks/5.44/karchive-5.44.0.zip URL http://download.kde.org/stable/frameworks/5.60/karchive-5.60.0.zip
URL_MD5 c60a8e22b88cc7328610041638459689 URL_MD5 50ae1495ef5b19898a06e43160d9b84d
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/karchive.diff PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/karchive.diff
INSTALL_DIR ${EXTPREFIX_frameworks} INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks} CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
...@@ -51,15 +52,16 @@ ExternalProject_Add( ...@@ -51,15 +52,16 @@ ExternalProject_Add(
ExternalProject_Add( ExternalProject_Add(
ext_kconfig ext_kconfig
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR} DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://download.kde.org/stable/frameworks/5.44/kconfig-5.44.0.zip URL http://download.kde.org/stable/frameworks/5.60/kconfig-5.60.0.zip
URL_MD5 d0223ea471bbf463ec42c2a2355a5183 URL_MD5 db96fdd78a574d07b09abb720dae1a06
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/kconfig.diff PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/kconfig.diff
INSTALL_DIR ${EXTPREFIX_frameworks} INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks} CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
${GLOBAL_PROFILE} ${GLOBAL_PROFILE}
-DCMAKE_SYSTEM_PREFIX_PATH=${EXTPREFIX} -DCMAKE_SYSTEM_PREFIX_PATH=${EXTPREFIX}
-DBUILD_TESTING=false -DBUILD_TESTING=false
-DKCONFIG_USE_DBUS=off
UPDATE_COMMAND "" UPDATE_COMMAND ""
DEPENDS ext_karchive DEPENDS ext_karchive
) )
...@@ -68,10 +70,10 @@ ExternalProject_Add( ...@@ -68,10 +70,10 @@ ExternalProject_Add(
ExternalProject_Add( ExternalProject_Add(
ext_kwidgetsaddons ext_kwidgetsaddons
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR} DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://download.kde.org/stable/frameworks/5.44/kwidgetsaddons-5.44.0.zip URL http://download.kde.org/stable/frameworks/5.60/kwidgetsaddons-5.60.0.zip
URL_MD5 a9911d8d0f8aaf7a7afd84c41c8f80a1 URL_MD5 1b09306fe482dd5665b16a243eb2be94
INSTALL_DIR ${EXTPREFIX_frameworks} INSTALL_DIR ${EXTPREFIX_frameworks}
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/kwidgetsaddons.diff # PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/kwidgetsaddons.diff
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks} CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
${GLOBAL_PROFILE} ${GLOBAL_PROFILE}
...@@ -85,8 +87,8 @@ ExternalProject_Add( ...@@ -85,8 +87,8 @@ ExternalProject_Add(
ExternalProject_Add( ExternalProject_Add(
ext_kcompletion ext_kcompletion
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR} DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://download.kde.org/stable/frameworks/5.44/kcompletion-5.44.0.zip URL http://download.kde.org/stable/frameworks/5.60/kcompletion-5.60.0.zip
URL_MD5 0647885a702c338a1b656eb4f311ad16 URL_MD5 a9848cb26ff96246769c56244f0db25f
INSTALL_DIR ${EXTPREFIX_frameworks} INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks} CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
...@@ -101,8 +103,8 @@ ExternalProject_Add( ...@@ -101,8 +103,8 @@ ExternalProject_Add(
ExternalProject_Add( ExternalProject_Add(
ext_kcoreaddons ext_kcoreaddons
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR} DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://download.kde.org/stable/frameworks/5.44/kcoreaddons-5.44.0.zip URL http://download.kde.org/stable/frameworks/5.60/kcoreaddons-5.60.0.zip
URL_MD5 16a7379f3e2941d1c19d6f80939f15e8 URL_MD5 da21c1532042c2c8a7e56f444c581196
INSTALL_DIR ${EXTPREFIX_frameworks} INSTALL_DIR ${EXTPREFIX_frameworks}
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/desktoptojson.diff PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/desktoptojson.diff
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks} CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
...@@ -118,8 +120,8 @@ ExternalProject_Add( ...@@ -118,8 +120,8 @@ ExternalProject_Add(
ExternalProject_Add( ExternalProject_Add(
ext_kguiaddons ext_kguiaddons
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR} DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://download.kde.org/stable/frameworks/5.44/kguiaddons-5.44.0.zip URL http://download.kde.org/stable/frameworks/5.60/kguiaddons-5.60.0.zip
URL_MD5 440eefbf5abcafc492dcf857f7e4eaf5 URL_MD5 f8aeea516e264c80df470efafab6ded0
INSTALL_DIR ${EXTPREFIX_frameworks} INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks} CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
...@@ -134,8 +136,8 @@ if(APPLE) ...@@ -134,8 +136,8 @@ if(APPLE)
ExternalProject_Add( ExternalProject_Add(
ext_ki18n ext_ki18n
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR} DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://download.kde.org/stable/frameworks/5.44/ki18n-5.44.0.zip URL http://download.kde.org/stable/frameworks/5.60/ki18n-5.60.0.zip
URL_MD5 333ab0a3f65a298e928d746144d4dc8e URL_MD5 e53f479f22ea17629319fec710dda036
INSTALL_DIR ${EXTPREFIX_frameworks} INSTALL_DIR ${EXTPREFIX_frameworks}
PATCH_COMMAND COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/ki18n-appdatalocation.diff PATCH_COMMAND COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/ki18n-appdatalocation.diff
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks} CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
...@@ -150,8 +152,8 @@ else() ...@@ -150,8 +152,8 @@ else()
ExternalProject_Add( ExternalProject_Add(
ext_ki18n ext_ki18n
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR} DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://download.kde.org/stable/frameworks/5.44/ki18n-5.44.0.zip URL http://download.kde.org/stable/frameworks/5.60/ki18n-5.60.0.zip
URL_MD5 333ab0a3f65a298e928d746144d4dc8e URL_MD5 e53f479f22ea17629319fec710dda036
INSTALL_DIR ${EXTPREFIX_frameworks} INSTALL_DIR ${EXTPREFIX_frameworks}
PATCH_COMMAND COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/ki18n-appdatalocation.diff PATCH_COMMAND COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/ki18n-appdatalocation.diff
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks} CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
...@@ -167,8 +169,8 @@ endif() ...@@ -167,8 +169,8 @@ endif()
ExternalProject_Add( ExternalProject_Add(
ext_kitemmodels ext_kitemmodels
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR} DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://download.kde.org/stable/frameworks/5.44/kitemmodels-5.44.0.zip URL http://download.kde.org/stable/frameworks/5.60/kitemmodels-5.60.0.zip
URL_MD5 ea43a5e2cc7033eb672796b108d7403b URL_MD5 c8f02881a65d496d6114bb2155cdfc36
INSTALL_DIR ${EXTPREFIX_frameworks} INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks} CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
...@@ -182,8 +184,8 @@ ExternalProject_Add( ...@@ -182,8 +184,8 @@ ExternalProject_Add(
ExternalProject_Add( ExternalProject_Add(
ext_kitemviews ext_kitemviews
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR} DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://download.kde.org/stable/frameworks/5.44/kitemviews-5.44.0.zip URL http://download.kde.org/stable/frameworks/5.60/kitemviews-5.60.0.zip
URL_MD5 8b15c703313c7a790c7db897ef17de7d URL_MD5 9d94b8da72f43fac39aa782f7efd941e
INSTALL_DIR ${EXTPREFIX_frameworks} INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks} CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
...@@ -197,8 +199,8 @@ ExternalProject_Add( ...@@ -197,8 +199,8 @@ ExternalProject_Add(
ExternalProject_Add( ExternalProject_Add(
ext_kimageformats ext_kimageformats
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR} DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://download.kde.org/stable/frameworks/5.44/kimageformats-5.44.0.zip URL http://download.kde.org/stable/frameworks/5.60/kimageformats-5.60.0.zip
URL_MD5 02a98b682f9cb655592148d7ebcc05e7 URL_MD5 a8b413560d12cd956d689784a056d6e0
INSTALL_DIR ${EXTPREFIX_frameworks} INSTALL_DIR ${EXTPREFIX_frameworks}
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/kimageformats.diff PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/kimageformats.diff
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks} CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
...@@ -213,8 +215,8 @@ ExternalProject_Add( ...@@ -213,8 +215,8 @@ ExternalProject_Add(
ExternalProject_Add( ExternalProject_Add(
ext_kwindowsystem ext_kwindowsystem
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR} DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://download.kde.org/stable/frameworks/5.44/kwindowsystem-5.44.0.zip URL http://download.kde.org/stable/frameworks/5.60/kwindowsystem-5.60.0.zip
URL_MD5 75329f47cf8cd413fa1d15a57c298563 URL_MD5 c15c29141b5edca67143b735a94d3f43
INSTALL_DIR ${EXTPREFIX_frameworks} INSTALL_DIR ${EXTPREFIX_frameworks}
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/kwindowsystem-x11.diff PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/kwindowsystem-x11.diff
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks} CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
...@@ -229,8 +231,8 @@ ExternalProject_Add( ...@@ -229,8 +231,8 @@ ExternalProject_Add(
ExternalProject_Add( ExternalProject_Add(
ext_kcrash ext_kcrash
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR} DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://download.kde.org/stable/frameworks/5.44/kcrash-5.44.0.zip URL http://download.kde.org/stable/frameworks/5.60/kcrash-5.60.0.zip
URL_MD5 61adc0e125c65288968d958acf25f4aa URL_MD5 7449a6f2b314b944ab2bed00124fe69b
INSTALL_DIR ${EXTPREFIX_frameworks} INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks} CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
......
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2441977..2a20a13 100644 index 45b3bf0..6afd3cb 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -29,20 +29,20 @@ set_package_properties(ZLIB PROPERTIES @@ -33,7 +33,7 @@ find_package(BZip2)
PURPOSE "Required by the core KDE libraries and some critical kioslaves" set_package_properties(BZip2 PROPERTIES
URL "https://sourceware.org/bzip2/"
DESCRIPTION "Support for BZip2 compressed files and data streams"
- TYPE RECOMMENDED
+ TYPE OPTIONAL
PURPOSE "Support for BZip2 compressed files and data streams"
) )
-find_package(BZip2) @@ -41,6 +41,7 @@ find_package(LibLZMA)
-set_package_properties(BZip2 PROPERTIES set_package_properties(LibLZMA PROPERTIES
- URL "http://www.bzip.org" URL "http://tukaani.org/xz/"
- DESCRIPTION "Support for BZip2 compressed files and data streams" DESCRIPTION "Support for xz compressed files and data streams"
- TYPE RECOMMENDED + TYPE OPTIONAL
- PURPOSE "Support for BZip2 compressed files and data streams" PURPOSE "Support for xz compressed files and data streams"
-)
-
-find_package(LibLZMA)
-set_package_properties(LibLZMA PROPERTIES
- URL "http://tukaani.org/xz/"
- DESCRIPTION "Support for xz compressed files and data streams"
- PURPOSE "Support for xz compressed files and data streams"
-)
+#find_package(BZip2)
+#set_package_properties(BZip2 PROPERTIES
+# URL "http://www.bzip.org"
+# DESCRIPTION "Support for BZip2 compressed files and data streams"
+# TYPE RECOMMENDED
+# PURPOSE "Support for BZip2 compressed files and data streams"
+#)
+
+#find_package(LibLZMA)
+#set_package_properties(LibLZMA PROPERTIES
+# URL "http://tukaani.org/xz/"
+# DESCRIPTION "Support for xz compressed files and data streams"
+# PURPOSE "Support for xz compressed files and data streams"
+#)
include_directories(
${ZLIB_INCLUDE_DIR}
) )
include_directories(
diff --git a/autotests/kconfigtest.cpp b/autotests/kconfigtest.cpp
index 3e0578f..6c4408d 100644
--- a/autotests/kconfigtest.cpp
+++ b/autotests/kconfigtest.cpp
@@ -587,7 +587,7 @@ void KConfigTest::testPathQtHome()
qunsetenv("QT_CACHE_HOME");
qunsetenv("QT_CONFIG_HOME");
QVERIFY(group.hasKey("dataDir"));
- QCOMPARE(group.readEntry("dataDir", QString()), QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation).append(QStringLiteral("/kconfigtest")));
+ QCOMPARE(group.readEntry("dataDir", QString()), QStandardPaths::writableLocation(QStandardPaths::AppDataLocation).append(QStringLiteral("/kconfigtest")));
QVERIFY(group.hasKey("cacheDir"));
QCOMPARE(group.readEntry("cacheDir", QString()), QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation).append(QStringLiteral("/kconfigtest")));
QVERIFY(group.hasKey("configDir"));
diff --git a/autotests/kdesktopfiletest.cpp b/autotests/kdesktopfiletest.cpp
index fd4a5c9..db08f22 100644
--- a/autotests/kdesktopfiletest.cpp
+++ b/autotests/kdesktopfiletest.cpp
@@ -222,7 +222,7 @@ void KDesktopFileTest::testIsAuthorizedDesktopFile()
QVERIFY(QFile::exists(fileName));
QVERIFY(!KDesktopFile::isAuthorizedDesktopFile(fileName));
- const QString installedFile = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("/kservices5/http_cache_cleaner.desktop"));
+ const QString installedFile = QStandardPaths::locate(QStandardPaths::AppDataLocation, QStringLiteral("/kservices5/http_cache_cleaner.desktop"));
if (!installedFile.isEmpty()) {
QVERIFY(KDesktopFile::isAuthorizedDesktopFile(installedFile));
} else {
@@ -281,8 +281,8 @@ void KDesktopFileTest::testLocateLocal_data()
{
QString systemConfigLocation = QStandardPaths::standardLocations(QStandardPaths::GenericConfigLocation).last();
QString writableConfigLocation = QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation);
- QString systemDataLocation = QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation).last();
- QString writableDataLocation = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation);
+ QString systemDataLocation = QStandardPaths::standardLocations(QStandardPaths::AppDataLocation).last();
+ QString writableDataLocation = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation);
QTest::addColumn<QString>("path");
QTest::addColumn<QString>("result");
diff --git a/autotests/test_kconf_update.cpp b/autotests/test_kconf_update.cpp
index 3353061..a80ae1e 100644
--- a/autotests/test_kconf_update.cpp
+++ b/autotests/test_kconf_update.cpp
@@ -625,7 +625,7 @@ void TestKConfUpdate::testScript()
QSharedPointer<QTemporaryFile> updFile(writeUpdFile(updContent));
- const QString scriptDir = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/kconf_update";
+ const QString scriptDir = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation) + "/kconf_update";
QVERIFY(QDir().mkpath(scriptDir));
QString scriptPath = scriptDir + "/test.sh";
writeFile(scriptPath, updScript);
diff --git a/docs/options.md b/docs/options.md diff --git a/docs/options.md b/docs/options.md
index fab22e1..8823818 100644 index c634c00..5e59219 100644
--- a/docs/options.md --- a/docs/options.md
+++ b/docs/options.md +++ b/docs/options.md
@@ -96,4 +96,4 @@ They are: @@ -96,4 +96,4 @@ They are:
...@@ -59,10 +9,10 @@ index fab22e1..8823818 100644 ...@@ -59,10 +9,10 @@ index fab22e1..8823818 100644
-* `$QT_DATA_HOME` - QStandardPaths::GenericDataLocation -* `$QT_DATA_HOME` - QStandardPaths::GenericDataLocation
+* `$QT_DATA_HOME` - QStandardPaths::AppDataLocation +* `$QT_DATA_HOME` - QStandardPaths::AppDataLocation
diff --git a/src/core/kconfig.cpp b/src/core/kconfig.cpp diff --git a/src/core/kconfig.cpp b/src/core/kconfig.cpp
index c8eb90a..18d1b69 100644 index e1b11ed..e3511cf 100644
--- a/src/core/kconfig.cpp --- a/src/core/kconfig.cpp
+++ b/src/core/kconfig.cpp +++ b/src/core/kconfig.cpp
@@ -229,7 +229,7 @@ QString KConfigPrivate::expandString(const QString &value) @@ -237,7 +237,7 @@ QString KConfigPrivate::expandString(const QString &value)
env = QString::fromLocal8Bit(pEnv.constData()); env = QString::fromLocal8Bit(pEnv.constData());
} else { } else {
if (aVarName == QStringLiteral("QT_DATA_HOME")) { if (aVarName == QStringLiteral("QT_DATA_HOME")) {
...@@ -72,19 +22,21 @@ index c8eb90a..18d1b69 100644 ...@@ -72,19 +22,21 @@ index c8eb90a..18d1b69 100644
env = QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation); env = QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation);
} else if (aVarName == QStringLiteral("QT_CACHE_HOME")) { } else if (aVarName == QStringLiteral("QT_CACHE_HOME")) {
diff --git a/src/core/kdesktopfile.cpp b/src/core/kdesktopfile.cpp diff --git a/src/core/kdesktopfile.cpp b/src/core/kdesktopfile.cpp
index b0b6a87..daddd54 100644 index d9283ce..f869fb0 100644
--- a/src/core/kdesktopfile.cpp --- a/src/core/kdesktopfile.cpp
+++ b/src/core/kdesktopfile.cpp +++ b/src/core/kdesktopfile.cpp
@@ -88,7 +88,7 @@ QString KDesktopFile::locateLocal(const QString &path) @@ -89,8 +89,8 @@ QString KDesktopFile::locateLocal(const QString &path)
} }
} }
// Relative to xdg data dir? (much more common) // Relative to xdg data dir? (much more common)
- Q_FOREACH (const QString &dir, QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation)) { - const QStringList lstGenericDataLocation = QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation);
+ Q_FOREACH (const QString &dir, QStandardPaths::standardLocations(QStandardPaths::AppDataLocation)) { - for (const QString &dir : lstGenericDataLocation) {
+ const QStringList lstAppDataLocation = QStandardPaths::standardLocations(QStandardPaths::AppDataLocation);
+ for (const QString &dir : lstAppDataLocation) {
if (path.startsWith(dir + plus)) { if (path.startsWith(dir + plus)) {
relativePath = path.mid(dir.length() + 1); relativePath = path.mid(dir.length() + 1);
} }
@@ -97,7 +97,7 @@ QString KDesktopFile::locateLocal(const QString &path) @@ -99,7 +99,7 @@ QString KDesktopFile::locateLocal(const QString &path)
// What now? The desktop file doesn't come from XDG_DATA_DIRS. Use filename only and hope for the best. // What now? The desktop file doesn't come from XDG_DATA_DIRS. Use filename only and hope for the best.
relativePath = path.mid(path.lastIndexOf(QLatin1Char('/')) + 1); relativePath = path.mid(path.lastIndexOf(QLatin1Char('/')) + 1);
} }
...@@ -93,20 +45,22 @@ index b0b6a87..daddd54 100644 ...@@ -93,20 +45,22 @@ index b0b6a87..daddd54 100644
} }
bool KDesktopFile::isDesktopFile(const QString &path) bool KDesktopFile::isDesktopFile(const QString &path)
@@ -134,7 +134,7 @@ bool KDesktopFile::isAuthorizedDesktopFile(const QString &path) @@ -136,8 +136,8 @@ bool KDesktopFile::isAuthorizedDesktopFile(const QString &path)
} }
} }
const QString servicesDir = QStringLiteral("kservices5/"); // KGlobal::dirs()->xdgDataRelativePath("services") const QString servicesDir = QStringLiteral("kservices5/"); // KGlobal::dirs()->xdgDataRelativePath("services")
- Q_FOREACH (const QString &xdgDataPrefix, QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation)) { - const QStringList lstGenericDataLocation = QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation);
+ Q_FOREACH (const QString &xdgDataPrefix, QStandardPaths::standardLocations(QStandardPaths::AppDataLocation)) { - for (const QString &xdgDataPrefix : lstGenericDataLocation) {
+ const QStringList lstAppDataLocation = QStandardPaths::standardLocations(QStandardPaths::AppDataLocation);
+ for (const QString &xdgDataPrefix : lstAppDataLocation) {
if (QDir(xdgDataPrefix).exists()) { if (QDir(xdgDataPrefix).exists()) {
const QString prefix = QFileInfo(xdgDataPrefix).canonicalFilePath(); const QString prefix = QFileInfo(xdgDataPrefix).canonicalFilePath();
if (realPath.startsWith(prefix + QLatin1Char('/') + servicesDir, sensitivity)) { if (realPath.startsWith(prefix + QLatin1Char('/') + servicesDir, sensitivity)) {
diff --git a/src/kconf_update/kconf_update.cpp b/src/kconf_update/kconf_update.cpp diff --git a/src/kconf_update/kconf_update.cpp b/src/kconf_update/kconf_update.cpp
index ab7d946..eeaf6ca 100644 index f6c7653..f9b83ac 100644
--- a/src/kconf_update/kconf_update.cpp --- a/src/kconf_update/kconf_update.cpp
+++ b/src/kconf_update/kconf_update.cpp +++ b/src/kconf_update/kconf_update.cpp
@@ -125,7 +125,7 @@ KonfUpdate::KonfUpdate(QCommandLineParser *parser) @@ -145,7 +145,7 @@ KonfUpdate::KonfUpdate(QCommandLineParser *parser)
m_bUseConfigInfo = false; m_bUseConfigInfo = false;
if (parser->isSet(QStringLiteral("check"))) { if (parser->isSet(QStringLiteral("check"))) {
m_bUseConfigInfo = true; m_bUseConfigInfo = true;
...@@ -114,26 +68,17 @@ index ab7d946..eeaf6ca 100644 ...@@ -114,26 +68,17 @@ index ab7d946..eeaf6ca 100644
+ const QString file = QStandardPaths::locate(QStandardPaths::AppDataLocation, "kconf_update/" + parser->value(QStringLiteral("check"))); + const QString file = QStandardPaths::locate(QStandardPaths::AppDataLocation, "kconf_update/" + parser->value(QStringLiteral("check")));
if (file.isEmpty()) { if (file.isEmpty()) {
qWarning("File '%s' not found.", parser->value(QStringLiteral("check")).toLocal8Bit().data()); qWarning("File '%s' not found.", parser->value(QStringLiteral("check")).toLocal8Bit().data());
log() << "File '" << parser->value(QStringLiteral("check")) << "' passed on command line not found" << endl; qCDebug(KCONF_UPDATE_LOG) << "File" << parser->value(QStringLiteral("check")) << "passed on command line not found";
@@ -177,7 +177,7 @@ KonfUpdate::log() @@ -190,7 +190,7 @@ QStringList KonfUpdate::findUpdateFiles(bool dirtyOnly)
{
if (!m_textStream) {
#if 0
- QString dir = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QLatin1Char('/') + "kconf_update/log";
+ QString dir = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation) + QLatin1Char('/') + "kconf_update/log";
QDir().mkpath(dir);
QString file = dir + "/update.log";
m_file = new QFile(file);
@@ -206,7 +206,7 @@ QStringList KonfUpdate::findUpdateFiles(bool dirtyOnly)
{ {
QStringList result; QStringList result;
- const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("kconf_update"), QStandardPaths::LocateDirectory); - const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("kconf_update"), QStandardPaths::LocateDirectory);
+ const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::AppDataLocation, QStringLiteral("kconf_update"), QStandardPaths::LocateDirectory); + const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::AppDataLocation, QStringLiteral("kconf_update"), QStandardPaths::LocateDirectory);
Q_FOREACH (const QString &d, dirs) { for (const QString &d : dirs) {
const QDir dir(d); const QDir dir(d);
@@ -760,7 +760,7 @@ void KonfUpdate::gotScript(const QString &_script) @@ -751,7 +751,7 @@ void KonfUpdate::gotScript(const QString &_script)
return; return;
} }
......
diff --git a/docs/programmers-guide.md b/docs/programmers-guide.md
index 9505366..65fc9a5 100644
--- a/docs/programmers-guide.md
+++ b/docs/programmers-guide.md
@@ -2246,7 +2246,7 @@ then a call to
~~~
QString splashPath = QStandardPaths::locate(
- QStandardPaths::GenericDataLocation, "splash.png");
+ QStandardPaths::AppDataLocation, "splash.png");
splashPath = KLocalizedString::localizedFilePath(splashPath);
~~~
diff --git a/src/kcatalog.cpp b/src/kcatalog.cpp diff --git a/src/kcatalog.cpp b/src/kcatalog.cpp
index c18d40f..b0ed09d 100644 index c47ffac..e24eb84 100644
--- a/src/kcatalog.cpp --- a/src/kcatalog.cpp
+++ b/src/kcatalog.cpp +++ b/src/kcatalog.cpp
@@ -128,7 +128,7 @@ QString KCatalog::catalogLocaleDir(const QByteArray &domain, @@ -144,7 +144,7 @@ QString KCatalog::catalogLocaleDir(const QByteArray &domain,
}
} }
return file;
#else
- const QString file = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("locale/") + relpath);
+ const QString file = QStandardPaths::locate(QStandardPaths::AppDataLocation, QStringLiteral("locale/") + relpath);
- QString file = QStandardPaths::locate(QStandardPaths::GenericDataLocation,
+ QString file = QStandardPaths::locate(QStandardPaths::AppDataLocation,
QStringLiteral("locale/") + relpath);
QString localeDir; QString localeDir;
if (file.isEmpty()) { if (!file.isEmpty()) {
@@ -143,7 +143,7 @@ QString KCatalog::catalogLocaleDir(const QByteArray &domain, @@ -158,7 +158,7 @@ QString KCatalog::catalogLocaleDir(const QByteArray &domain,
QSet<QString> KCatalog::availableCatalogLanguages(const QByteArray &domain_) QSet<QString> KCatalog::availableCatalogLanguages(const QByteArray &domain_)
{ {
QString domain = QFile::decodeName(domain_); QString domain = QFile::decodeName(domain_);
...@@ -20,3 +33,16 @@ index c18d40f..b0ed09d 100644 ...@@ -20,3 +33,16 @@ index c18d40f..b0ed09d 100644
QStringLiteral("locale"), QStringLiteral("locale"),
QStandardPaths::LocateDirectory); QStandardPaths::LocateDirectory);
diff --git a/src/klocalizedstring.cpp b/src/klocalizedstring.cpp
index eb42c81..219bb51 100644
--- a/src/klocalizedstring.cpp
+++ b/src/klocalizedstring.cpp
@@ -1363,7 +1363,7 @@ void KLocalizedStringPrivate::locateScriptingModule(const QByteArray &domain,
// Try to find this module.
QString modapath = QStandardPaths::locate(
- QStandardPaths::GenericDataLocation,
+ QStandardPaths::AppDataLocation,
QLatin1String("locale") + QLatin1Char('/') + modrpath);