Merge branch 'Plasma/5.15'

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)

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)) {

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)
 

kcmkwin/kwindecoration/Messages.sh

@@ -1,4 +1,4 @@
 #! /usr/bin/env bash
 $EXTRACTRC `find . -name "*.ui"` >> rc.cpp || exit 11
-$XGETTEXT `find . -name "*.cpp" -o -name "*.qml"` -o $podir/kcmkwindecoration.pot
+$XGETTEXT `find . -name "*.cpp" -o -name "*.qml"` -o $podir/kcm_kwindecoration.pot
 rm -f rc.cpp