From c00c67bf29c10862a973289486a535c8566d5110 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Wed, 3 Sep 2014 09:47:21 +0200 Subject: [PATCH] [scripting] Drop qmlRegisterType for QQuickWindow Not needed as one can just do: import QtQuick.Window; This fixes a build problem with Qt 5.4. BUG: 338277 --- scripting/scripting.cpp | 1 - scripts/desktopchangeosd/contents/ui/osd.qml | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/scripting/scripting.cpp b/scripting/scripting.cpp index 3bc43585db..9dc7badba8 100644 --- a/scripting/scripting.cpp +++ b/scripting/scripting.cpp @@ -620,7 +620,6 @@ void KWin::Scripting::init() qmlRegisterType("org.kde.kwin", 2, 0, "ClientModelByScreenAndDesktop"); qmlRegisterType("org.kde.kwin", 2, 0, "ClientFilterModel"); qmlRegisterType(); - qmlRegisterType(); qmlRegisterType(); m_qmlEngine->rootContext()->setContextProperty(QStringLiteral("workspace"), m_workspaceWrapper); diff --git a/scripts/desktopchangeosd/contents/ui/osd.qml b/scripts/desktopchangeosd/contents/ui/osd.qml index fbf7dd7691..e2ff86c5b4 100644 --- a/scripts/desktopchangeosd/contents/ui/osd.qml +++ b/scripts/desktopchangeosd/contents/ui/osd.qml @@ -18,6 +18,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . *********************************************************************/ import QtQuick 2.0; +import QtQuick.Window 2.0; import org.kde.plasma.core 2.0 as PlasmaCore; import org.kde.plasma.components 2.0 as Plasma; import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddons;