...
 
Commits (279)
......@@ -28,3 +28,5 @@ GSYMS
BROWSE
*.kate-swp
/po/
build_dir
.flatpak-builder
......@@ -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)) {
- const QStringList lstGenericDataLocation = QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation);
- for (const QString &xdgDataPrefix : lstGenericDataLocation) {
+ const QStringList lstAppDataLocation = QStandardPaths::standardLocations(QStandardPaths::AppDataLocation);
+ for (const QString &xdgDataPrefix : lstAppDataLocation) {
if (QDir(xdgDataPrefix).exists()) {
const QString prefix = QFileInfo(xdgDataPrefix).canonicalFilePath();
if (realPath.startsWith(prefix + QLatin1Char('/') + servicesDir, sensitivity)) {
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
+++ 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;
if (parser->isSet(QStringLiteral("check"))) {
m_bUseConfigInfo = true;
......@@ -114,26 +68,17 @@ index ab7d946..eeaf6ca 100644
+ const QString file = QStandardPaths::locate(QStandardPaths::AppDataLocation, "kconf_update/" + parser->value(QStringLiteral("check")));
if (file.isEmpty()) {
qWarning("File '%s' not found.", parser->value(QStringLiteral("check")).toLocal8Bit().data());
log() << "File '" << parser->value(QStringLiteral("check")) << "' passed on command line not found" << endl;
@@ -177,7 +177,7 @@ KonfUpdate::log()
{
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)
qCDebug(KCONF_UPDATE_LOG) << "File" << parser->value(QStringLiteral("check")) << "passed on command line not found";
@@ -190,7 +190,7 @@ QStringList KonfUpdate::findUpdateFiles(bool dirtyOnly)
{
QStringList result;
- const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, 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);
@@ -760,7 +760,7 @@ void KonfUpdate::gotScript(const QString &_script)
@@ -751,7 +751,7 @@ void KonfUpdate::gotScript(const QString &_script)
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
index c18d40f..b0ed09d 100644
index c47ffac..e24eb84 100644
--- a/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;
if (file.isEmpty()) {
@@ -143,7 +143,7 @@ QString KCatalog::catalogLocaleDir(const QByteArray &domain,
if (!file.isEmpty()) {
@@ -158,7 +158,7 @@ QString KCatalog::catalogLocaleDir(const QByteArray &domain,
QSet<QString> KCatalog::availableCatalogLanguages(const QByteArray &domain_)
{
QString domain = QFile::decodeName(domain_);
......@@ -20,3 +33,16 @@ index c18d40f..b0ed09d 100644
QStringLiteral("locale"),
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);
// If the module exists and hasn't been already included.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 178117e..497395d 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -54,11 +54,11 @@ if(MSVC)
endif()
add_definitions(-DTRANSLATION_DOMAIN=\"ki18n5\")
-if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po")
- ki18n_install(po)
-endif()
+#if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po")
+# ki18n_install(po)
+#endif()
add_subdirectory(src)
-add_subdirectory(autotests)
+#add_subdirectory(autotests)
# create a Config.cmake and a ConfigVersion.cmake file and install them
set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5I18n")
diff --git a/cmake/KF5I18NMacros.cmake b/cmake/KF5I18NMacros.cmake
index 53ba812..db8ea98 100755
--- a/cmake/KF5I18NMacros.cmake
+++ b/cmake/KF5I18NMacros.cmake
@@ -25,14 +25,9 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
-find_package(Gettext REQUIRED)
-find_package(PythonInterp REQUIRED)
-
-set(_ki18n_pmap_compile_script ${CMAKE_CURRENT_LIST_DIR}/ts-pmap-compile.py)
-set(_ki18n_uic_script ${CMAKE_CURRENT_LIST_DIR}/kf5i18nuic.cmake)
-
#create the implementation files from the ui files and add them to the list of sources
#usage: KI18N_WRAP_UI(foo_SRCS ${ui_files})
+set(_ki18n_uic_script ${CMAKE_CURRENT_LIST_DIR}/kf5i18nuic.cmake)
macro (KI18N_WRAP_UI _sources )
foreach (_current_FILE ${ARGN})
@@ -57,6 +52,13 @@ macro (KI18N_WRAP_UI _sources )
endforeach (_current_FILE)
endmacro (KI18N_WRAP_UI)
+find_package(Gettext)
+find_package(PythonInterp)
+
+if (Gettext_FOUND AND PythonInterp_FOUND)
+
+set(_ki18n_pmap_compile_script ${CMAKE_CURRENT_LIST_DIR}/ts-pmap-compile.py)
+
#install the scripts for a given language in the target folder
#usage: KI18N_INSTALL_TS_FILES("ja" ${scripts_dir})
function(KI18N_INSTALL_TS_FILES lang scripts_dir)
@@ -225,3 +227,7 @@ function(_KI18N_GETTEXT_GET_UNIQUE_TARGET_NAME _name _unique_name)
set_property(GLOBAL PROPERTY ${propertyName} ${currentCounter} )
endfunction()
# End of CMake copied code ####################################################
+
+else()
+ message("Warning: Python and Gettext are needed for some functionality.")
+endif() # Python and gettext found
diff --git a/src/kstartupinfo.cpp b/src/kstartupinfo.cpp
index a97b8b5..0ae7e5b 100644
index 76ab3be..014ab36 100644
--- a/src/kstartupinfo.cpp
+++ b/src/kstartupinfo.cpp
@@ -493,7 +493,7 @@ bool KStartupInfo::sendStartupX(Display *disp_P, const KStartupInfoId &id_P,
@@ -490,7 +490,7 @@ bool KStartupInfo::sendStartupX(Display *disp_P, const KStartupInfoId &id_P,
#ifdef KSTARTUPINFO_ALL_DEBUG
qCDebug(LOG_KWINDOWSYSTEM) << "sending " << msg;
#endif
......@@ -11,7 +11,7 @@ index a97b8b5..0ae7e5b 100644
#else
Q_UNUSED(disp_P)
Q_UNUSED(data_P)
@@ -548,7 +548,7 @@ bool KStartupInfo::sendChangeX(Display *disp_P, const KStartupInfoId &id_P,
@@ -565,7 +565,7 @@ bool KStartupInfo::sendChangeX(Display *disp_P, const KStartupInfoId &id_P,
#ifdef KSTARTUPINFO_ALL_DEBUG
qCDebug(LOG_KWINDOWSYSTEM) << "sending " << msg;
#endif
......@@ -20,7 +20,7 @@ index a97b8b5..0ae7e5b 100644
#else
Q_UNUSED(disp_P)
Q_UNUSED(data_P)
@@ -580,7 +580,7 @@ bool KStartupInfo::sendFinishX(Display *disp_P, const KStartupInfoId &id_P)
@@ -617,7 +617,7 @@ bool KStartupInfo::sendFinishX(Display *disp_P, const KStartupInfoId &id_P)
#ifdef KSTARTUPINFO_ALL_DEBUG
qCDebug(LOG_KWINDOWSYSTEM) << "sending " << msg;
#endif
......@@ -29,7 +29,7 @@ index a97b8b5..0ae7e5b 100644
#else
Q_UNUSED(disp_P)
return true;
@@ -615,7 +615,7 @@ bool KStartupInfo::sendFinishX(Display *disp_P, const KStartupInfoId &id_P,
@@ -668,7 +668,7 @@ bool KStartupInfo::sendFinishX(Display *disp_P, const KStartupInfoId &id_P,
#ifdef KSTARTUPINFO_ALL_DEBUG
qCDebug(LOG_KWINDOWSYSTEM) << "sending " << msg;
#endif
......@@ -39,10 +39,10 @@ index a97b8b5..0ae7e5b 100644
Q_UNUSED(disp_P)
Q_UNUSED(id_P)
diff --git a/src/platforms/xcb/kwindowsystem.cpp b/src/platforms/xcb/kwindowsystem.cpp
index 9d28704..603d9b2 100644
index 6789b7c..84b6d4c 100644
--- a/src/platforms/xcb/kwindowsystem.cpp
+++ b/src/platforms/xcb/kwindowsystem.cpp
@@ -196,7 +196,7 @@ bool NETEventFilter::nativeEventFilter(xcb_generic_event_t *ev)
@@ -234,7 +234,7 @@ bool NETEventFilter::nativeEventFilter(xcb_generic_event_t *ev)
int old_number_of_desktops = numberOfDesktops();
bool old_showing_desktop = showingDesktop();
unsigned long m[ 5 ];
......
......@@ -3,8 +3,8 @@ SET(PREFIX_ext_gmic "${EXTPREFIX}" )
# Download the gmic sources
ExternalProject_Add( ext_gmic_base
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL https://gmic.eu/files/source/gmic_2.5.6.tar.gz
URL_MD5 8deabebc29081657986ae6531e3fc1d7
URL https://gmic.eu/files/source/gmic_2.6.7.tar.gz
URL_MD5 1d55ec5d349ccf0ef78cf8d1b4a42af8
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/cmake.diff
COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/no_threads.diff
......@@ -23,8 +23,8 @@ ExternalProject_Add( ext_gmic_base
# FIXME: Forcing CMAKE_BUILD_TYPE to Release
ExternalProject_Add( ext_gmic_qt
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL https://github.com/c-koi/gmic-qt/archive/v.2.5.6.tar.gz
URL_MD5 4e7cf71d6348d44f98d3c132433c358c
URL https://github.com/c-koi/gmic-qt/archive/v.2.6.7.tar.gz
URL_MD5 bdbd6e77d78e478e8653c1396065afc5
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/desktop_icon.diff
SOURCE_DIR gmic-qt
......
......@@ -84,8 +84,8 @@ if (WIN32)
ExternalProject_Add(
ext_qt
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL https://download.qt.io/official_releases/qt/5.12/5.12.4/single/qt-everywhere-src-5.12.4.tar.xz
URL_MD5 dda95b0239d13c5276834177af3a8588
URL https://download.qt.io/official_releases/qt/5.12/5.12.4/single/qt-everywhere-src-5.12.4.zip
URL_MD5 16526e08adfad46e8e686b8af984b9b5
PATCH_COMMAND ${ext_qt_PATCH_COMMAND}
......
......@@ -2,11 +2,11 @@ project(krita)
message(STATUS "Using CMake version: ${CMAKE_VERSION}")
cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
cmake_minimum_required(VERSION 3.0.0 FATAL_ERROR)
set(MIN_QT_VERSION 5.9.0)
set(MIN_FRAMEWORKS_VERSION 5.18.0)
set(MIN_FRAMEWORKS_VERSION 5.44.0)
if (POLICY CMP0002)
cmake_policy(SET CMP0002 OLD)
......@@ -443,6 +443,8 @@ add_definitions(
-DQT_STRICT_ITERATORS
-DQT_NO_SIGNALS_SLOTS_KEYWORDS
-DQT_NO_URL_CAST_FROM_STRING
-DQT_USE_FAST_CONCATENATION
-DQT_USE_FAST_OPERATOR_PLUS
)
if (${Qt5_VERSION} VERSION_GREATER "5.8.0" )
......
......@@ -2,8 +2,8 @@
| Jenkins CI Name | Master | Stable |
| --------------- | ------ | ------ |
| OpenSuse Qt 5.10 | [![Build Status](https://build.kde.org/job/Extragear/job/krita/job/kf5-qt5%20SUSEQt5.10/badge/icon)](https://build.kde.org/job/Extragear/job/krita/job/kf5-qt5%20SUSEQt5.10/) |[![Build Status](https://build.kde.org/buildStatus/icon?job=Extragear%2Fkrita%2Fstable-kf5-qt5+SUSEQt5.10)](https://build.kde.org/job/Extragear/job/krita/job/stable-kf5-qt5%20SUSEQt5.10/)|
| FreeBSD Qt 5.12 | [![Build Status](https://build.kde.org/job/Extragear/job/krita/job/kf5-qt5%20FreeBSDQt5.12/badge/icon)](https://build.kde.org/job/Extragear/job/krita/job/kf5-qt5%20FreeBSDQt5.12/) |[![Build Status](https://build.kde.org/job/Extragear/job/krita/job/stable-kf5-qt5%20FreeBSDQt5.12/badge/icon)](https://build.kde.org/job/Extragear/job/krita/job/stable-kf5-qt5%20FreeBSDQt5.12/)|
| OpenSuse Qt 5.12 | [![Build Status](https://build.kde.org/job/Extragear/job/krita/job/kf5-qt5%20SUSEQt5.12/badge/icon)](https://build.kde.org/job/Extragear/job/krita/job/kf5-qt5%20SUSEQt5.12/) |[![Build Status](https://build.kde.org/buildStatus/icon?job=Extragear%2Fkrita%2Fstable-kf5-qt5+SUSEQt5.12)](https://build.kde.org/job/Extragear/job/krita/job/stable-kf5-qt5%20SUSEQt5.12/)|
| FreeBSD Qt 5.13 | [![Build Status](https://build.kde.org/job/Extragear/job/krita/job/kf5-qt5%20FreeBSDQt5.13/badge/icon)](https://build.kde.org/job/Extragear/job/krita/job/kf5-qt5%20FreeBSDQt5.13/) |[![Build Status](https://build.kde.org/job/Extragear/job/krita/job/stable-kf5-qt5%20FreeBSDQt5.13/badge/icon)](https://build.kde.org/job/Extragear/job/krita/job/stable-kf5-qt5%20FreeBSDQt5.13/)|
Krita is a free and open source digital painting application. It is for artists who want to create professional work from start to end. Krita is used by comic book artists, illustrators, concept artists, matte and texture painters and in the digital VFX industry.
......
......@@ -37,6 +37,7 @@ set(kis_mask_generator_benchmark_SRCS kis_mask_generator_benchmark.cpp)
set(kis_low_memory_benchmark_SRCS kis_low_memory_benchmark.cpp)
set(KisAnimationRenderingBenchmark_SRCS KisAnimationRenderingBenchmark.cpp)
set(kis_filter_selections_benchmark_SRCS kis_filter_selections_benchmark.cpp)
set(KisShapeLayerCOWBenchmark_SRCS KisShapeLayerCOWBenchmark.cpp)
if (UNIX)
set(kis_composition_benchmark_SRCS kis_composition_benchmark.cpp)
endif()
......@@ -63,6 +64,7 @@ if(UNIX)
krita_add_benchmark(KisCompositionBenchmark TESTNAME krita-benchmarks-KisComposition ${kis_composition_benchmark_SRCS})
endif()
krita_add_benchmark(KisThumbnailBenchmark TESTNAME krita-benchmarks-KisThumbnail ${kis_thumbnail_benchmark_SRCS})
krita_add_benchmark(KisShapeLayerCOWBenchmark TESTNAME krita-benchmarks-KisShapeLayerCOW ${KisShapeLayerCOWBenchmark_SRCS})
target_link_libraries(KisDatamanagerBenchmark kritaimage Qt5::Test)
target_link_libraries(KisHLineIteratorBenchmark kritaimage Qt5::Test)
......@@ -89,5 +91,5 @@ if(UNIX)
endif()
target_link_libraries(KisMaskGeneratorBenchmark kritaimage Qt5::Test)
target_link_libraries(KisThumbnailBenchmark kritaimage Qt5::Test)
target_link_libraries(KisShapeLayerCOWBenchmark kritaui kritaimage Qt5::Test)
/*
* Copyright (c) 2019 Tusooa Zhu <tusooa@vista.aero>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include "KisShapeLayerCOWBenchmark.h"
#include <KisPart.h>
#include <QTest>
#include <kistest.h>
#include <KisDocument.h>
#include <KoColor.h>
#include <KoPathShape.h>
#include <KoShapeStroke.h>
#include <KoShapeControllerBase.h>
#include <KisRunnableBasedStrokeStrategy.h>
#include <KisRunnableStrokeJobData.h>
const int NUM_SHAPES = 1000;
class StrokeStrategy : public KisRunnableBasedStrokeStrategy
{
public:
StrokeStrategy() : KisRunnableBasedStrokeStrategy("")
{
enableJob(KisSimpleStrokeStrategy::JOB_DOSTROKE);
}
};
void KisShapeLayerCOWBenchmark::initTestCase()
{
m_doc.reset(KisPart::instance()->createDocument());
KoColor color;
color.fromQColor(QColor(0, 0, 0));
m_doc->newImage("test", 1024, 1024, KoColorSpaceRegistry::instance()->rgb8(), color, KisConfig::BackgroundStyle::RASTER_LAYER, 1, "", 96.0);
KisImageSP image(m_doc->image());
m_initialLayer = new KisShapeLayer(m_doc->shapeController(), image, "test vector layer", OPACITY_OPAQUE_U8);
KisStrokeId stroke = image->startStroke(new StrokeStrategy);
image->addJob(stroke, new KisRunnableStrokeJobData(
[this]() {
for (int i = 1; i <= NUM_SHAPES; ++i) {
KoPathShape *shape = new KoPathShape;
shape->moveTo(QPointF(0, 0));
shape->lineTo(QPointF(i, i));
shape->normalize();
shape->setStroke(toQShared(new KoShapeStroke(1.0)));
m_initialLayer->addShape(shape);
}
}, KisStrokeJobData::SEQUENTIAL, KisStrokeJobData::EXCLUSIVE));
image->endStroke(stroke);
image->waitForDone();
}
void KisShapeLayerCOWBenchmark::benchmarkCopyUnmodified()
{
KisNodeSP clonedLayer = m_initialLayer->clone();
KisImageSP image(m_doc->image());
QBENCHMARK {
KisStrokeId stroke = image->startStroke(new StrokeStrategy);
image->addJob(stroke, new KisRunnableStrokeJobData(
[this, clonedLayer]() {
m_initialLayer->copyFromNode(clonedLayer);
}, KisStrokeJobData::SEQUENTIAL, KisStrokeJobData::EXCLUSIVE));
image->endStroke(stroke);
image->waitForDone();
}
}
void KisShapeLayerCOWBenchmark::benchmarkCopyModified()
{
KisNodeSP unmodifiedClone = m_initialLayer->clone();
KisShapeLayerSP clonedLayer = dynamic_cast<KisShapeLayer *>(m_initialLayer->clone().data());
QList<KoShape *> shapes = clonedLayer->shapes();
KisImageSP image(m_doc->image());
KisStrokeId stroke = image->startStroke(new StrokeStrategy);
image->addJob(stroke, new KisRunnableStrokeJobData(
[this, &shapes]() {
for (int i = 1; i <= NUM_SHAPES; i += 2) {
KoPathShape *shape = dynamic_cast<KoPathShape *>(shapes[i]);
KIS_ASSERT_RECOVER_NOOP(shape);
shape->moveTo(QPointF(1023, 1023));
shape->lineTo(QPointF(i, i));
shape->normalize();
shape->setStroke(toQShared(new KoShapeStroke(1.0)));
m_initialLayer->addShape(shape);
}
}, KisStrokeJobData::SEQUENTIAL, KisStrokeJobData::EXCLUSIVE));
image->endStroke(stroke);
image->waitForDone();
QBENCHMARK {
KisStrokeId stroke = image->startStroke(new StrokeStrategy);
image->addJob(stroke, new KisRunnableStrokeJobData(
[this, clonedLayer, unmodifiedClone]() {
m_initialLayer->copyFromNode(clonedLayer);
m_initialLayer->copyFromNode(unmodifiedClone);
}, KisStrokeJobData::SEQUENTIAL, KisStrokeJobData::EXCLUSIVE));
image->endStroke(stroke);
image->waitForDone();
}
}
KISTEST_MAIN(KisShapeLayerCOWBenchmark)
/*
* Copyright (c) 2019 Tusooa Zhu <tusooa@vista.aero>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifndef KIS_SHAPE_LAYER_COW_BENCHMARK_H_
#define KIS_SHAPE_LAYER_COW_BENCHMARK_H_
#include <QtTest>
#include <kis_shape_layer.h>
#include <KisDocument.h>
class KisShapeLayerCOWBenchmark : public QObject
{
Q_OBJECT
private Q_SLOTS:
void initTestCase();
void benchmarkCopyUnmodified();
void benchmarkCopyModified();
private:
QScopedPointer<KisDocument> m_doc;
KisShapeLayerSP m_initialLayer;
};
#endif
......@@ -63,8 +63,6 @@
#define MEMALIGN_FREE(p) free((p))
#endif
const int alpha_pos = 3;
enum AlphaRange {
ALPHA_ZERO,
ALPHA_UNIT,
......
......@@ -15,16 +15,16 @@ set(krita_SRCS main.cc)
# Set the application icon on the application
if (NOT APPLE)
file(GLOB ICON_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/pics/app/*-apps-calligrakrita.png")
file(GLOB ICON_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/pics/app/*-apps-krita.png")
else()
set(ICON_SRCS
"${CMAKE_CURRENT_SOURCE_DIR}/pics/app/16-apps-calligrakrita.png"
"${CMAKE_CURRENT_SOURCE_DIR}/pics/app/32-apps-calligrakrita.png"
"${CMAKE_CURRENT_SOURCE_DIR}/pics/app/48-apps-calligrakrita.png"
"${CMAKE_CURRENT_SOURCE_DIR}/pics/app/128-apps-calligrakrita.png"
"${CMAKE_CURRENT_SOURCE_DIR}/pics/app/256-apps-calligrakrita.png"
"${CMAKE_CURRENT_SOURCE_DIR}/pics/app/512-apps-calligrakrita.png"
"${CMAKE_CURRENT_SOURCE_DIR}/pics/app/1024-apps-calligrakrita.png"
"${CMAKE_CURRENT_SOURCE_DIR}/pics/app/16-apps-krita.png"
"${CMAKE_CURRENT_SOURCE_DIR}/pics/app/32-apps-krita.png"
"${CMAKE_CURRENT_SOURCE_DIR}/pics/app/48-apps-krita.png"
"${CMAKE_CURRENT_SOURCE_DIR}/pics/app/128-apps-krita.png"
"${CMAKE_CURRENT_SOURCE_DIR}/pics/app/256-apps-krita.png"
"${CMAKE_CURRENT_SOURCE_DIR}/pics/app/512-apps-krita.png"
"${CMAKE_CURRENT_SOURCE_DIR}/pics/app/1024-apps-krita.png"
)
endif()
ecm_add_app_icon(krita_SRCS ICONS ${ICON_SRCS})
......
This diff is collapsed.
......@@ -103,6 +103,7 @@ Juan Luis Boya García
Juan Palacios
Jure Repinc
Kai-Uwe Behrmann
Karl Ove Hufthammer
Kevin Krammer
Kevin Ottens
Kurt Pfeifle
......
......@@ -89,7 +89,7 @@
<whatsThis></whatsThis>
<statusTip></statusTip>
<isCheckable>false</isCheckable>
<text>Move right</text>
<text>Move right more</text>
</Action>
</Actions>
</ActionCollection>
......@@ -14,7 +14,7 @@
[General]
name=Krita Default
version=3
version=4
[Pan Canvas]
0={0;4;[];0;0;2}
......@@ -68,3 +68,6 @@ version=3
7={7;2;[1000021,20];1;0;0}