From 0cf7cca2ab6a26db35251706124b6a903a32d2b6 Mon Sep 17 00:00:00 2001 From: Victor Ruzhykh Date: Mon, 11 Feb 2019 20:12:41 +0200 Subject: [PATCH 1/2] Make the new Window Decoration KCM translatable Differential Revision: https://phabricator.kde.org/D18931 --- kcmkwin/kwindecoration/CMakeLists.txt | 2 +- kcmkwin/kwindecoration/Messages.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kcmkwin/kwindecoration/CMakeLists.txt b/kcmkwin/kwindecoration/CMakeLists.txt index e04ed3a877..a1e8b612dd 100644 --- a/kcmkwin/kwindecoration/CMakeLists.txt +++ b/kcmkwin/kwindecoration/CMakeLists.txt @@ -1,5 +1,5 @@ # KI18N Translation Domain for this library -add_definitions(-DTRANSLATION_DOMAIN=\"kcmkwindecoration\") +add_definitions(-DTRANSLATION_DOMAIN=\"kcm_kwindecoration\") add_subdirectory(declarative-plugin) diff --git a/kcmkwin/kwindecoration/Messages.sh b/kcmkwin/kwindecoration/Messages.sh index 3f9d8a3d83..d1d5819863 100644 --- a/kcmkwin/kwindecoration/Messages.sh +++ b/kcmkwin/kwindecoration/Messages.sh @@ -1,4 +1,4 @@ #!bin/sh $EXTRACTRC `find . -name \*.rc -o -name \*.ui -o -name \*.kcfg` >> rc.cpp -$XGETTEXT `find . -name \*.qml -o -name \*.cpp -o -name \*.h` -o $podir/kcmkwindecoration.pot +$XGETTEXT `find . -name \*.qml -o -name \*.cpp -o -name \*.h` -o $podir/kcm_kwindecoration.pot rm -f rc.cpp From 48971e084853a5e13ba7193aa6d8ce986477748a Mon Sep 17 00:00:00 2001 From: David Faure Date: Tue, 12 Feb 2019 08:54:41 +0100 Subject: [PATCH 2/2] Enable -DQT_NO_URL_CAST_FROM_STRING and fix compilation --- CMakeLists.txt | 2 +- kcmkwin/common/effectmodel.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a22c74e736..3c9aa48d67 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,7 +48,7 @@ include(KDECompilerSettings NO_POLICY_SCOPE) include(ECMInstallIcons) include(ECMOptionalAddSubdirectory) -add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0 -DQT_USE_QSTRINGBUILDER) +add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0 -DQT_USE_QSTRINGBUILDER -DQT_NO_URL_CAST_FROM_STRING) set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD_REQUIRED ON) diff --git a/kcmkwin/common/effectmodel.cpp b/kcmkwin/common/effectmodel.cpp index a6fbbab904..76615b373f 100644 --- a/kcmkwin/common/effectmodel.cpp +++ b/kcmkwin/common/effectmodel.cpp @@ -292,7 +292,7 @@ void EffectModel::loadJavascriptEffects(const KConfigGroup &kwinConfig) effect.enabledByDefault = plugin.isPluginEnabledByDefault(); effect.enabledByDefaultFunction = false; effect.video = plugin.property(QStringLiteral("X-KWin-Video-Url")).toUrl(); - effect.website = plugin.website(); + effect.website = QUrl(plugin.website()); effect.supported = true; effect.exclusiveGroup = plugin.property(QStringLiteral("X-KWin-Exclusive-Category")).toString(); effect.internal = plugin.property(QStringLiteral("X-KWin-Internal")).toBool(); @@ -355,7 +355,7 @@ void EffectModel::loadPluginEffects(const KConfigGroup &kwinConfig, const KPlugi effect.enabledByDefaultFunction = d.value("enabledByDefaultMethod").toBool(); } - effect.website = pluginEffect.website(); + effect.website = QUrl(pluginEffect.website()); const QString enabledKey = QStringLiteral("%1Enabled").arg(effect.serviceName); if (kwinConfig.hasKey(enabledKey)) {