Commit bef84207 authored by Boudewijn Rempt's avatar Boudewijn Rempt

Merge branch 'rempt/update-frameworks'

parents af5acee0 c23ef5a9
......@@ -18,8 +18,8 @@ SET(EXTPREFIX_frameworks "${EXTPREFIX}" )
ExternalProject_Add(
ext_extra_cmake_modules
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://download.kde.org/Attic/frameworks/5.24/extra-cmake-modules-5.24.0.zip
URL_MD5 e0c19ba97ebd964f9bdc9110c64ce96a
URL http://download.kde.org/stable/frameworks/5.44/extra-cmake-modules-5.44.0.zip
URL_MD5 74aa8fc501e27024390b01c81f2925eb
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 +34,8 @@ ExternalProject_Add(
ExternalProject_Add(
ext_karchive
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://download.kde.org/Attic/frameworks/5.24/karchive-5.24.0.zip
URL_MD5 739843accfe9bd85ab2f1582722cf01e
URL http://download.kde.org/stable/frameworks/5.44/karchive-5.44.0.zip
URL_MD5 c60a8e22b88cc7328610041638459689
INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
......@@ -50,8 +50,8 @@ ExternalProject_Add(
ExternalProject_Add(
ext_kconfig
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://download.kde.org/Attic/frameworks/5.24/kconfig-5.24.0.zip
URL_MD5 f87ecff795eb76e4ec6561758a5baf87
URL http://download.kde.org/stable/frameworks/5.44/kconfig-5.44.0.zip
URL_MD5 d0223ea471bbf463ec42c2a2355a5183
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/kconfig.diff
INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
......@@ -67,8 +67,8 @@ ExternalProject_Add(
ExternalProject_Add(
ext_kwidgetsaddons
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://download.kde.org/Attic/frameworks/5.24/kwidgetsaddons-5.24.0.zip
URL_MD5 0e399b427814a4814c65a3cf407f9d79
URL http://download.kde.org/stable/frameworks/5.44/kwidgetsaddons-5.44.0.zip
URL_MD5 a9911d8d0f8aaf7a7afd84c41c8f80a1
INSTALL_DIR ${EXTPREFIX_frameworks}
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/kwidgetsaddons.diff
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
......@@ -84,8 +84,8 @@ ExternalProject_Add(
ExternalProject_Add(
ext_kcompletion
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://download.kde.org/Attic/frameworks/5.24/kcompletion-5.24.0.zip
URL_MD5 e8764251ab45005aa81dba242852300c
URL http://download.kde.org/stable/frameworks/5.44/kcompletion-5.44.0.zip
URL_MD5 0647885a702c338a1b656eb4f311ad16
INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
......@@ -100,11 +100,10 @@ ExternalProject_Add(
ExternalProject_Add(
ext_kcoreaddons
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://download.kde.org/Attic/frameworks/5.24/kcoreaddons-5.24.0.zip
URL_MD5 2885878625b19ad0300ef3770b897112
URL http://download.kde.org/stable/frameworks/5.44/kcoreaddons-5.44.0.zip
URL_MD5 16a7379f3e2941d1c19d6f80939f15e8
INSTALL_DIR ${EXTPREFIX_frameworks}
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/desktoptojson.diff
COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/kcoreaddons-compile-fix.diff
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
${GLOBAL_PROFILE}
......@@ -118,8 +117,8 @@ ExternalProject_Add(
ExternalProject_Add(
ext_kguiaddons
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://download.kde.org/Attic/frameworks/5.24/kguiaddons-5.24.0.zip
URL_MD5 9bdadbc57d0634816ef80ee9798c3d6c
URL http://download.kde.org/stable/frameworks/5.44/kguiaddons-5.44.0.zip
URL_MD5 440eefbf5abcafc492dcf857f7e4eaf5
INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
......@@ -134,11 +133,10 @@ if(APPLE)
ExternalProject_Add(
ext_ki18n
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://download.kde.org/Attic/frameworks/5.17/ki18n-5.17.0.zip
URL_MD5 7d60380d09f98defbf878ea9daba0fbb
URL http://download.kde.org/stable/frameworks/5.44/ki18n-5.44.0.zip
URL_MD5 333ab0a3f65a298e928d746144d4dc8e
INSTALL_DIR ${EXTPREFIX_frameworks}
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/ki18n.diff
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}
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
${GLOBAL_PROFILE}
......@@ -151,11 +149,10 @@ else()
ExternalProject_Add(
ext_ki18n
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://download.kde.org/Attic/frameworks/5.17/ki18n-5.17.0.zip
URL_MD5 7d60380d09f98defbf878ea9daba0fbb
URL http://download.kde.org/stable/frameworks/5.44/ki18n-5.44.0.zip
URL_MD5 333ab0a3f65a298e928d746144d4dc8e
INSTALL_DIR ${EXTPREFIX_frameworks}
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/ki18n.diff
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}
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
${GLOBAL_PROFILE}
......@@ -165,11 +162,12 @@ ExternalProject_Add(
DEPENDS ext_kguiaddons
)
endif()
ExternalProject_Add(
ext_kitemmodels
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://download.kde.org/Attic/frameworks/5.24/kitemmodels-5.24.0.zip
URL_MD5 ff41589f48395fc01d5fc7887593779d
URL http://download.kde.org/stable/frameworks/5.44/kitemmodels-5.44.0.zip
URL_MD5 ea43a5e2cc7033eb672796b108d7403b
INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
......@@ -183,8 +181,8 @@ ExternalProject_Add(
ExternalProject_Add(
ext_kitemviews
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://download.kde.org/Attic/frameworks/5.24/kitemviews-5.24.0.zip
URL_MD5 33f638d027a3011a6a69f7484eee3287
URL http://download.kde.org/stable/frameworks/5.44/kitemviews-5.44.0.zip
URL_MD5 8b15c703313c7a790c7db897ef17de7d
INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
......@@ -198,8 +196,8 @@ ExternalProject_Add(
ExternalProject_Add(
ext_kimageformats
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://download.kde.org/Attic/frameworks/5.24/kimageformats-5.24.0.zip
URL_MD5 c1964516bcb2bfe882858f0c0913deb5
URL http://download.kde.org/stable/frameworks/5.44/kimageformats-5.44.0.zip
URL_MD5 02a98b682f9cb655592148d7ebcc05e7
INSTALL_DIR ${EXTPREFIX_frameworks}
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/kimageformats.diff
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
......@@ -214,8 +212,8 @@ ExternalProject_Add(
ExternalProject_Add(
ext_kwindowsystem
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://download.kde.org/Attic/frameworks/5.24/kwindowsystem-5.24.0.zip
URL_MD5 5915e4f63ded983af6db7db3a6cbae1a
URL http://download.kde.org/stable/frameworks/5.44/kwindowsystem-5.44.0.zip
URL_MD5 75329f47cf8cd413fa1d15a57c298563
INSTALL_DIR ${EXTPREFIX_frameworks}
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/kwindowsystem-x11.diff
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
......@@ -230,8 +228,8 @@ ExternalProject_Add(
ExternalProject_Add(
ext_kcrash
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://download.kde.org/Attic/frameworks/5.24/kcrash-5.24.0.zip
URL_MD5 a2e41e6650105fc3ac8fbd44afbae4fe
URL http://download.kde.org/stable/frameworks/5.44/kcrash-5.44.0.zip
URL_MD5 61adc0e125c65288968d958acf25f4aa
INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
......
diff --git a/autotests/kconfigtest.cpp b/autotests/kconfigtest.cpp
index 2b905b5..8c72d58 100644
index 3e0578f..6c4408d 100644
--- a/autotests/kconfigtest.cpp
+++ b/autotests/kconfigtest.cpp
@@ -570,7 +570,7 @@ void KConfigTest::testPathQtHome()
@@ -587,7 +587,7 @@ void KConfigTest::testPathQtHome()
qunsetenv("QT_CACHE_HOME");
qunsetenv("QT_CONFIG_HOME");
QVERIFY(group.hasKey("dataDir"));
......@@ -12,10 +12,10 @@ index 2b905b5..8c72d58 100644
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 393a6a0..083626d 100644
index fd4a5c9..db08f22 100644
--- a/autotests/kdesktopfiletest.cpp
+++ b/autotests/kdesktopfiletest.cpp
@@ -201,7 +201,7 @@ void KDesktopFileTest::testIsAuthorizedDesktopFile()
@@ -222,7 +222,7 @@ void KDesktopFileTest::testIsAuthorizedDesktopFile()
QVERIFY(QFile::exists(fileName));
QVERIFY(!KDesktopFile::isAuthorizedDesktopFile(fileName));
......@@ -24,8 +24,19 @@ index 393a6a0..083626d 100644
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 4180619..32cd88a 100644
index 3353061..a80ae1e 100644
--- a/autotests/test_kconf_update.cpp
+++ b/autotests/test_kconf_update.cpp
@@ -625,7 +625,7 @@ void TestKConfUpdate::testScript()
......@@ -38,20 +49,20 @@ index 4180619..32cd88a 100644
QString scriptPath = scriptDir + "/test.sh";
writeFile(scriptPath, updScript);
diff --git a/docs/options.md b/docs/options.md
index ba7e2d8..a960a7d 100644
index fab22e1..8823818 100644
--- a/docs/options.md
+++ b/docs/options.md
@@ -96,4 +96,4 @@ They are:
`$QT_CACHE_HOME` - QStandardPaths::GenericConfigLocation
`$QT_CONFIG_HOME` - QStandardPaths::GenericConfigLocation
- `$QT_DATA_HOME` - QStandardPaths::GenericDataLocation
+ `$QT_DATA_HOME` - QStandardPaths::AppDataLocation
* `$QT_CACHE_HOME` - QStandardPaths::GenericCacheLocation
* `$QT_CONFIG_HOME` - QStandardPaths::GenericConfigLocation
-* `$QT_DATA_HOME` - QStandardPaths::GenericDataLocation
+* `$QT_DATA_HOME` - QStandardPaths::AppDataLocation
diff --git a/src/core/kconfig.cpp b/src/core/kconfig.cpp
index ad52da9..0401ced 100644
index c8eb90a..18d1b69 100644
--- a/src/core/kconfig.cpp
+++ b/src/core/kconfig.cpp
@@ -228,7 +228,7 @@ QString KConfigPrivate::expandString(const QString &value)
@@ -229,7 +229,7 @@ QString KConfigPrivate::expandString(const QString &value)
env = QString::fromLocal8Bit(pEnv.constData());
} else {
if (aVarName == QStringLiteral("QT_DATA_HOME")) {
......@@ -61,7 +72,7 @@ index ad52da9..0401ced 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 4a55030..e28e5df 100644
index b0b6a87..daddd54 100644
--- a/src/core/kdesktopfile.cpp
+++ b/src/core/kdesktopfile.cpp
@@ -88,7 +88,7 @@ QString KDesktopFile::locateLocal(const QString &path)
......@@ -71,7 +82,7 @@ index 4a55030..e28e5df 100644
- Q_FOREACH (const QString &dir, QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation)) {
+ Q_FOREACH (const QString &dir, QStandardPaths::standardLocations(QStandardPaths::AppDataLocation)) {
if (path.startsWith(dir + plus)) {
relativePath = dir.mid(path.length() + 1);
relativePath = path.mid(dir.length() + 1);
}
@@ -97,7 +97,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.
......@@ -92,7 +103,7 @@ index 4a55030..e28e5df 100644
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 2acd720..d89ae3d 100644
index ab7d946..eeaf6ca 100644
--- a/src/kconf_update/kconf_update.cpp
+++ b/src/kconf_update/kconf_update.cpp
@@ -125,7 +125,7 @@ KonfUpdate::KonfUpdate(QCommandLineParser *parser)
......
commit e0ea4199bc4da359eb91ab51274785d17a4f2909
Author: Ralf Habacker <ralf.habacker@freenet.de>
Date: Wed Sep 21 13:38:03 2016 +0200
Windows compile fix.
diff --git a/src/lib/util/kuser_win.cpp b/src/lib/util/kuser_win.cpp
index 1d77f89..5c3fa45 100644
--- a/src/lib/util/kuser_win.cpp
+++ b/src/lib/util/kuser_win.cpp
@@ -853,7 +853,7 @@ static std::unique_ptr<char[]> queryProcessInformation(TOKEN_INFORMATION_CLASS t
HANDLE _token;
if (!OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &_token)) {
qWarning("Failed to get the token for the current process: %d", (int)GetLastError());
- return false;
+ return nullptr;
}
ScopedHANDLE token(_token, handleCloser);
// query required size
diff --git a/src/kcatalog.cpp b/src/kcatalog.cpp
index 7711e9b..b6280ed 100644
index c18d40f..b0ed09d 100644
--- a/src/kcatalog.cpp
+++ b/src/kcatalog.cpp
@@ -112,7 +112,7 @@ QString KCatalog::catalogLocaleDir(const QByteArray &domain,
{
QString relpath = QString::fromLatin1("%1/LC_MESSAGES/%2.mo")
.arg(language, QFile::decodeName(domain));
@@ -128,7 +128,7 @@ QString KCatalog::catalogLocaleDir(const QByteArray &domain,
}
}
- QString file = QStandardPaths::locate(QStandardPaths::GenericDataLocation,
+ QString file = QStandardPaths::locate(QStandardPaths::AppDataLocation,
QString::fromLatin1("locale/") + relpath);
QStringLiteral("locale/") + relpath);
QString localeDir;
if (file.isEmpty()) {
@@ -127,7 +127,7 @@ QString KCatalog::catalogLocaleDir(const QByteArray &domain,
@@ -143,7 +143,7 @@ QString KCatalog::catalogLocaleDir(const QByteArray &domain,
QSet<QString> KCatalog::availableCatalogLanguages(const QByteArray &domain_)
{
QString domain = QFile::decodeName(domain_);
- QStringList localeDirPaths = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation,
+ QStringList localeDirPaths = QStandardPaths::locateAll(QStandardPaths::AppDataLocation,
QString::fromLatin1("locale"),
QStringLiteral("locale"),
QStandardPaths::LocateDirectory);
QSet<QString> availableLanguages;
diff --git a/src/kcollapsiblegroupbox.cpp b/src/kcollapsiblegroupbox.cpp
index edda7af..3ae7d86 100644
--- a/src/kcollapsiblegroupbox.cpp
+++ b/src/kcollapsiblegroupbox.cpp
@@ -94,9 +94,9 @@ void KCollapsibleGroupBox::setTitle(const QString& title)
}
d->shortcutId = grabShortcut(QKeySequence::mnemonic(title));
-
+#ifndef QT_NO_ACCESSIBILITY
setAccessibleName(title);
-
+#endif
emit titleChanged();
}
diff --git a/src/kled.cpp b/src/kled.cpp
index 1e46929..63a817b 100644
--- a/src/kled.cpp
+++ b/src/kled.cpp
@@ -57,7 +57,9 @@ KLed::KLed(const QColor &color, QWidget *parent)
d(new Private)
{
setColor(color);
+#ifndef QT_NO_ACCESSIBILITY
updateAccessibleName();
+#endif
}
KLed::KLed(const QColor &color, State state, Look look, Shape shape,
@@ -70,7 +72,9 @@ KLed::KLed(const QColor &color, State state, Look look, Shape shape,
d->shape = shape;
setColor(color);
+#ifndef QT_NO_ACCESSIBILITY
updateAccessibleName();
+#endif
}
KLed::~KLed()
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8baeda3..bd5491e 100755
index f7eb931..3f0f6d6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,8 +36,8 @@ if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po")
@@ -39,8 +39,8 @@ if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po")
endif()
add_subdirectory(src)
......@@ -53,4 +13,3 @@ index 8baeda3..bd5491e 100755
# create a Config.cmake and a ConfigVersion.cmake file and install them
set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5WidgetsAddons")
......@@ -10,7 +10,7 @@ if (OVERRIDE_QT_VERSION)
set(MIN_QT_VERSION 5.4.0)
endif()
set(MIN_FRAMEWORKS_VERSION 5.7.0)
set(MIN_FRAMEWORKS_VERSION 5.22.0)
if (POLICY CMP0002)
cmake_policy(SET CMP0002 OLD)
......@@ -252,7 +252,7 @@ endif(MINGW)
#########################
########################
find_package(ECM 5.19 REQUIRED NOMODULE)
find_package(ECM 5.22 REQUIRED NOMODULE)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
include(ECMOptionalAddSubdirectory)
include(ECMAddAppIcon)
......
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