...
 
Commits (869)

Too many changes to show.

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

*.orig
*.rej
__pycache__
*.egg-info
*.trace
......@@ -28,3 +29,5 @@ GSYMS
BROWSE
*.kate-swp
/po/
build_dir
.flatpak-builder
......@@ -124,6 +124,10 @@ if (APPLE)
set(PATCH_COMMAND patch)
endif ()
if (ANDROID)
set (GLOBAL_PROFILE ${GLOBAL_PROFILE} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} -DANDROID_PLATFORM=${ANDROID_PLATFORM} -DANDROID_ABI=${ANDROID_ABI})
endif()
if (UNIX AND NOT APPLE)
set(LINUX true)
set(PATCH_COMMAND patch)
......@@ -192,6 +196,10 @@ add_subdirectory( ext_vc )
add_subdirectory( ext_gsl )
add_subdirectory( ext_fftw3 )
add_subdirectory( ext_ocio )
add_subdirectory( ext_openjpeg )
if (MSVC)
add_subdirectory( ext_pthreads )
endif (MSVC)
add_subdirectory( ext_fontconfig)
add_subdirectory( ext_freetype)
add_subdirectory( ext_qt )
......
......@@ -153,7 +153,7 @@ Note: on all operating systems the entire procedure is done in a terminal window
cmake --build . --config RelWithDebInfo --target ext_vc
cmake --build . --config RelWithDebInfo --target ext_libraw
cmake --build . --config RelWithDebInfo --target ext_giflib
```
cmake --build . --config RelWithDebInfo --target ext_openjpeg
On Linux (if you want to build your own SIP and PyQt instead of the system one)
```
......
SET(PREFIX_ext_exiv2 "${EXTPREFIX}" )
if (ANDROID)
ExternalProject_Add( ext_exiv2
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/exiv2-0.26-trunk.tar.gz
URL_MD5 5399e3b570d7f9205f0e76d47582da4c
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/tzname.patch
COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/patch_mingw.patch
COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/disable_exiv_apps.diff
COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/gcccheck.patch
INSTALL_DIR ${PREFIX_ext_exiv2}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_exiv2} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE} -DEXIV2_ENABLE_BUILD_SAMPLES=OFF -DEXIV2_ENABLE_BUILD_PO=OFF -DEXIV2_ENABLE_NLS=OFF -DICONV_INCLUDE_DIR=${PREFIX_ext_exiv2}/include -DEXPAT_LIBRARY=$ENV{BUILD_ROOT}/i/lib/libexpat.so -DEXPAT_INCLUDE_DIR=$ENV{BUILD_ROOT}/i/include
UPDATE_COMMAND ""
DEPENDS ext_iconv ext_expat
)
else()
ExternalProject_Add( ext_exiv2
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/exiv2-0.26-trunk.tar.gz
......@@ -16,3 +36,4 @@ ExternalProject_Add( ext_exiv2
UPDATE_COMMAND ""
DEPENDS ext_iconv ext_expat
)
endif()
......@@ -14,6 +14,20 @@ ExternalProject_Add( ext_expat
DEPENDS ext_patch
)
elseif (ANDROID)
ExternalProject_Add( ext_expat
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/expat-2.1.0.tar.gz
URL_MD5 dd7dab7a5fea97d2a6a43f511449b7cd
INSTALL_DIR ${PREFIX_ext_expat}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_expat} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE}
BUILD_COMMAND make
INSTALL_COMMAND make install
UPDATE_COMMAND ""
)
else()
ExternalProject_Add( ext_expat
......@@ -22,9 +36,9 @@ ExternalProject_Add( ext_expat
URL_MD5 dd7dab7a5fea97d2a6a43f511449b7cd
INSTALL_DIR ${PREFIX_ext_expat}
CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=${PREFIX_ext_expat} ${GLOBAL_AUTOMAKE_PROFILE}
BUILD_COMMAND make
INSTALL_COMMAND make install
CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=${PREFIX_ext_expat} ${GLOBAL_AUTOMAKE_PROFILE}
BUILD_COMMAND make
INSTALL_COMMAND make install
UPDATE_COMMAND ""
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
# -*- coding: utf-8 -*-
import info
class subinfo(info.infoclass):
def setTargets(self):
self.targets['3.2.2'] = 'http://www.fftw.org/fftw-3.2.2.tar.gz'
self.targetDigests['3.2.2'] = 'd43b799eedfb9408f62f9f056f5e8a645618467b'
self.targetInstSrc['3.2.2'] = "fftw-3.2.2"
self.patchToApply['3.2.2'] = [('fftw-3.2.2-20111221.diff', 1),
('fftw-3.2.2-20130818.diff', 1)]
self.shortDescription = "a C subroutine library for computing the discrete Fourier transform (DFT)"
self.defaultTarget = '3.2.2'
def setDependencies(self):
self.buildDependencies['virtual/base'] = 'default'
from Package.CMakePackageBase import *
class Package(CMakePackageBase):
def __init__(self):
CMakePackageBase.__init__(self)
self.supportsNinja = False
self.subinfo.options.configure.defines = "-DFFTW_SINGLE=ON -DFFTW_DOUBLE=OFF -DBUILD_BENCHMARKS=OFF"
......@@ -12,14 +12,15 @@ SET(EXTPREFIX_frameworks "${EXTPREFIX}" )
# ItemModels
# ItemViews
# WindowSystem
# kimageformats
# On Linux:
# KCrash
ExternalProject_Add(
ext_extra_cmake_modules
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://download.kde.org/stable/frameworks/5.44/extra-cmake-modules-5.44.0.zip
URL_MD5 74aa8fc501e27024390b01c81f2925eb
URL http://download.kde.org/stable/frameworks/5.60/extra-cmake-modules-5.60.0.zip
URL_MD5 c205e17d89028ab0b034e68081d5ebfb
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/ecm_install_to_share.diff
INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
......@@ -34,8 +35,8 @@ ExternalProject_Add(
ExternalProject_Add(
ext_karchive
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://download.kde.org/stable/frameworks/5.44/karchive-5.44.0.zip
URL_MD5 c60a8e22b88cc7328610041638459689
URL http://download.kde.org/stable/frameworks/5.60/karchive-5.60.0.zip
URL_MD5 50ae1495ef5b19898a06e43160d9b84d
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/karchive.diff
INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
......@@ -51,15 +52,16 @@ ExternalProject_Add(
ExternalProject_Add(
ext_kconfig
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://download.kde.org/stable/frameworks/5.44/kconfig-5.44.0.zip
URL_MD5 d0223ea471bbf463ec42c2a2355a5183
URL http://download.kde.org/stable/frameworks/5.60/kconfig-5.60.0.zip
URL_MD5 db96fdd78a574d07b09abb720dae1a06
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/kconfig.diff
INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
${GLOBAL_PROFILE}
-DCMAKE_SYSTEM_PREFIX_PATH=${EXTPREFIX}
-DBUILD_TESTING=false
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
${GLOBAL_PROFILE}
-DCMAKE_SYSTEM_PREFIX_PATH=${EXTPREFIX}
-DBUILD_TESTING=false
-DKCONFIG_USE_DBUS=off
UPDATE_COMMAND ""
DEPENDS ext_karchive
)
......@@ -68,10 +70,10 @@ ExternalProject_Add(
ExternalProject_Add(
ext_kwidgetsaddons
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://download.kde.org/stable/frameworks/5.44/kwidgetsaddons-5.44.0.zip
URL_MD5 a9911d8d0f8aaf7a7afd84c41c8f80a1
URL http://download.kde.org/stable/frameworks/5.60/kwidgetsaddons-5.60.0.zip
URL_MD5 1b09306fe482dd5665b16a243eb2be94
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}
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
${GLOBAL_PROFILE}
......@@ -85,8 +87,8 @@ ExternalProject_Add(
ExternalProject_Add(
ext_kcompletion
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://download.kde.org/stable/frameworks/5.44/kcompletion-5.44.0.zip
URL_MD5 0647885a702c338a1b656eb4f311ad16
URL http://download.kde.org/stable/frameworks/5.60/kcompletion-5.60.0.zip
URL_MD5 a9848cb26ff96246769c56244f0db25f
INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
......@@ -101,8 +103,8 @@ ExternalProject_Add(
ExternalProject_Add(
ext_kcoreaddons
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://download.kde.org/stable/frameworks/5.44/kcoreaddons-5.44.0.zip
URL_MD5 16a7379f3e2941d1c19d6f80939f15e8
URL http://download.kde.org/stable/frameworks/5.60/kcoreaddons-5.60.0.zip
URL_MD5 da21c1532042c2c8a7e56f444c581196
INSTALL_DIR ${EXTPREFIX_frameworks}
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/desktoptojson.diff
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
......@@ -118,8 +120,8 @@ ExternalProject_Add(
ExternalProject_Add(
ext_kguiaddons
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://download.kde.org/stable/frameworks/5.44/kguiaddons-5.44.0.zip
URL_MD5 440eefbf5abcafc492dcf857f7e4eaf5
URL http://download.kde.org/stable/frameworks/5.60/kguiaddons-5.60.0.zip
URL_MD5 f8aeea516e264c80df470efafab6ded0
INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
......@@ -134,8 +136,8 @@ if(APPLE)
ExternalProject_Add(
ext_ki18n
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://download.kde.org/stable/frameworks/5.44/ki18n-5.44.0.zip
URL_MD5 333ab0a3f65a298e928d746144d4dc8e
URL http://download.kde.org/stable/frameworks/5.60/ki18n-5.60.0.zip
URL_MD5 e53f479f22ea17629319fec710dda036
INSTALL_DIR ${EXTPREFIX_frameworks}
PATCH_COMMAND COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/ki18n-appdatalocation.diff
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
......@@ -150,8 +152,8 @@ else()
ExternalProject_Add(
ext_ki18n
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://download.kde.org/stable/frameworks/5.44/ki18n-5.44.0.zip
URL_MD5 333ab0a3f65a298e928d746144d4dc8e
URL http://download.kde.org/stable/frameworks/5.60/ki18n-5.60.0.zip
URL_MD5 e53f479f22ea17629319fec710dda036
INSTALL_DIR ${EXTPREFIX_frameworks}
PATCH_COMMAND COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/ki18n-appdatalocation.diff
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
......@@ -167,8 +169,8 @@ endif()
ExternalProject_Add(
ext_kitemmodels
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://download.kde.org/stable/frameworks/5.44/kitemmodels-5.44.0.zip
URL_MD5 ea43a5e2cc7033eb672796b108d7403b
URL http://download.kde.org/stable/frameworks/5.60/kitemmodels-5.60.0.zip
URL_MD5 c8f02881a65d496d6114bb2155cdfc36
INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
......@@ -182,8 +184,8 @@ ExternalProject_Add(
ExternalProject_Add(
ext_kitemviews
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://download.kde.org/stable/frameworks/5.44/kitemviews-5.44.0.zip
URL_MD5 8b15c703313c7a790c7db897ef17de7d
URL http://download.kde.org/stable/frameworks/5.60/kitemviews-5.60.0.zip
URL_MD5 9d94b8da72f43fac39aa782f7efd941e
INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
......@@ -197,8 +199,8 @@ ExternalProject_Add(
ExternalProject_Add(
ext_kimageformats
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://download.kde.org/stable/frameworks/5.44/kimageformats-5.44.0.zip
URL_MD5 02a98b682f9cb655592148d7ebcc05e7
URL http://download.kde.org/stable/frameworks/5.60/kimageformats-5.60.0.zip
URL_MD5 a8b413560d12cd956d689784a056d6e0
INSTALL_DIR ${EXTPREFIX_frameworks}
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/kimageformats.diff
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
......@@ -213,8 +215,8 @@ ExternalProject_Add(
ExternalProject_Add(
ext_kwindowsystem
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://download.kde.org/stable/frameworks/5.44/kwindowsystem-5.44.0.zip
URL_MD5 75329f47cf8cd413fa1d15a57c298563
URL http://download.kde.org/stable/frameworks/5.60/kwindowsystem-5.60.0.zip
URL_MD5 c15c29141b5edca67143b735a94d3f43
INSTALL_DIR ${EXTPREFIX_frameworks}
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/kwindowsystem-x11.diff
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
......@@ -229,8 +231,8 @@ ExternalProject_Add(
ExternalProject_Add(
ext_kcrash
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://download.kde.org/stable/frameworks/5.44/kcrash-5.44.0.zip
URL_MD5 61adc0e125c65288968d958acf25f4aa
URL http://download.kde.org/stable/frameworks/5.60/kcrash-5.60.0.zip
URL_MD5 7449a6f2b314b944ab2bed00124fe69b
INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
......
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2441977..2a20a13 100644
index 45b3bf0..6afd3cb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,20 +29,20 @@ set_package_properties(ZLIB PROPERTIES
PURPOSE "Required by the core KDE libraries and some critical kioslaves"
@@ -33,7 +33,7 @@ find_package(BZip2)
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)
-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"
-)
+#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}
@@ -41,6 +41,7 @@ find_package(LibLZMA)
set_package_properties(LibLZMA PROPERTIES
URL "http://tukaani.org/xz/"
DESCRIPTION "Support for xz compressed files and data streams"
+ TYPE OPTIONAL
PURPOSE "Support for xz compressed files and data streams"
)
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
index fab22e1..8823818 100644
index c634c00..5e59219 100644
--- a/docs/options.md
+++ b/docs/options.md
@@ -96,4 +96,4 @@ They are:
......@@ -59,10 +9,10 @@ index fab22e1..8823818 100644
-* `$QT_DATA_HOME` - QStandardPaths::GenericDataLocation
+* `$QT_DATA_HOME` - QStandardPaths::AppDataLocation
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
+++ 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());
} else {
if (aVarName == QStringLiteral("QT_DATA_HOME")) {
......@@ -72,19 +22,21 @@ index c8eb90a..18d1b69 100644
env = QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation);
} else if (aVarName == QStringLiteral("QT_CACHE_HOME")) {
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
+++ 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)
- Q_FOREACH (const QString &dir, QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation)) {
+ Q_FOREACH (const QString &dir, QStandardPaths::standardLocations(QStandardPaths::AppDataLocation)) {
- const QStringList lstGenericDataLocation = QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation);
- for (const QString &dir : lstGenericDataLocation) {
+ const QStringList lstAppDataLocation = QStandardPaths::standardLocations(QStandardPaths::AppDataLocation);
+ for (const QString &dir : lstAppDataLocation) {
if (path.startsWith(dir + plus)) {
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.
relativePath = path.mid(path.lastIndexOf(QLatin1Char('/')) + 1);
}
......@@ -93,20 +45,22 @@ index b0b6a87..daddd54 100644
}
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")
- Q_FOREACH (const QString &xdgDataPrefix, QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation)) {
+ Q_FOREACH (const QString &xdgDataPrefix, QStandardPaths::standardLocations(QStandardPaths::AppDataLocation)) {