From 95ab9d05aa5063fd3f16a7592230dae4ca0edc4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Wed, 26 Feb 2014 08:30:52 +0100 Subject: [PATCH] [kwin] Remove dependency on KF5Declarative It's a runtime dependency as PlasmaCore pulls it in automatically, so we don't it as all the QML we currently ship uses PlasmaCore. --- CMakeLists.txt | 1 - scripting/CMakeLists.txt | 1 - scripting/scripting.cpp | 5 ----- 3 files changed, 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6280477823..ae322c3f6b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -242,7 +242,6 @@ set(kwin_QT_LIBS ) set(kwin_KDE_LIBS - KF5::Declarative KF5::ConfigCore KF5::CoreAddons KF5::Crash diff --git a/scripting/CMakeLists.txt b/scripting/CMakeLists.txt index 8da0067166..a1ef3f4bda 100644 --- a/scripting/CMakeLists.txt +++ b/scripting/CMakeLists.txt @@ -2,7 +2,6 @@ set(kcm_kwin4_genericscripted_SRCS genericscriptedconfig.cpp) kde4_add_plugin( kcm_kwin4_genericscripted ${kcm_kwin4_genericscripted_SRCS} ) target_link_libraries( kcm_kwin4_genericscripted KF5::ConfigWidgets #KCModule - KF5::Declarative KF5::I18n KF5::Service KF5::Plasma diff --git a/scripting/scripting.cpp b/scripting/scripting.cpp index ae14b22eff..72d5cab3e7 100644 --- a/scripting/scripting.cpp +++ b/scripting/scripting.cpp @@ -35,7 +35,6 @@ along with this program. If not, see . #include #include #include -#include // Qt #include #include @@ -543,10 +542,6 @@ void KWin::DeclarativeScript::run() if (running()) { return; } - KDeclarative::KDeclarative kdeclarative; - kdeclarative.setDeclarativeEngine(m_engine); - kdeclarative.initialize(); - kdeclarative.setupBindings(); qmlRegisterType("org.kde.kwin", 2, 0, "DesktopThumbnailItem"); qmlRegisterType("org.kde.kwin", 2, 0, "ThumbnailItem"); qmlRegisterType("org.kde.kwin", 2, 0, "DBusCall");