yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'Plasma/5.15'

Browse source
This commit is contained in:
David Faure 2019-02-12 08:56:17 +01:00
commit 1b316b6b69
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

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

4
kcmkwin/common/effectmodel.cpp
View file

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

2
kcmkwin/kwindecoration/CMakeLists.txt
View file

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

2
kcmkwin/kwindecoration/Messages.sh
View file

@ -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