[kcmkwin/compositing] Improve initialization of kdeclarative

We need kdeclarative for i18n support. This needs to be done before we
load the source. By that we don't need to import Plasma.Core which isn't
used by the views at all.

Also we don't need to link twice against declarative.

kcmkwin/kwincompositing/CMakeLists.txt

@@ -39,7 +39,6 @@ target_link_libraries(kwincompositing
     KF5::Service
     KF5::KCMUtils
     KF5::NewStuff
-    KF5::Declarative
     kwin4_effect_builtins
 )
 
@@ -71,7 +70,6 @@ target_link_libraries(effectModelTest
     KF5::Service
     KF5::KCMUtils
     KF5::NewStuff
-    KF5::Declarative
     kwin4_effect_builtins
 )
 

kcmkwin/kwincompositing/main.cpp

@@ -27,7 +27,6 @@
 
 #include <kcmodule.h>
 #include <kservice.h>
-#include <kdeclarative/kdeclarative.h>
 
 class KWinCompositingKCM : public KCModule
 {
@@ -68,9 +67,6 @@ KWinCompositingKCM::KWinCompositingKCM(QWidget* parent, const QVariantList& args
     : KCModule(parent, args)
     , m_view(new KWin::Compositing::EffectView(viewType))
 {
-    KDeclarative::KDeclarative kdeclarative;
-    kdeclarative.setDeclarativeEngine(m_view->engine());
-    kdeclarative.setupBindings();
     QVBoxLayout *vl = new QVBoxLayout(this);
 
     QWidget *w = QWidget::createWindowContainer(m_view.data(), this);

kcmkwin/kwincompositing/model.cpp

@@ -32,6 +32,7 @@
 #include <KSharedConfig>
 #include <KCModuleProxy>
 #include <KPluginTrader>
+#include <kdeclarative/kdeclarative.h>
 
 #include <QAbstractItemModel>
 #include <QDBusConnection>
@@ -511,6 +512,9 @@ EffectView::EffectView(ViewType type, QWindow *parent)
 
 void EffectView::init(ViewType type)
 {
+    KDeclarative::KDeclarative kdeclarative;
+    kdeclarative.setDeclarativeEngine(engine());
+    kdeclarative.setupBindings();
     QString path;
     switch (type) {
     case CompositingSettingsView:

kcmkwin/kwincompositing/qml/CompositingView.qml

@@ -23,7 +23,6 @@ import QtQuick 2.1
 import QtQuick.Controls 1.0
 import QtQuick.Layouts 1.0
 import org.kde.kwin.kwincompositing 1.0
-import org.kde.plasma.core 2.0
 
 Item {
     signal changed

kcmkwin/kwincompositing/qml/EffectView.qml

@@ -22,7 +22,6 @@ import QtQuick 2.1
 import QtQuick.Controls 1.0
 import QtQuick.Layouts 1.0
 import org.kde.kwin.kwincompositing 1.0
-import org.kde.plasma.core 2.0
 
 Item {
     signal changed

kcmkwin/kwincompositing/qml/OpenGLErrorView.qml

@@ -21,8 +21,6 @@
 import QtQuick 2.1
 import QtQuick.Controls 1.0
 import QtQuick.Layouts 1.0
-// for i18n
-import org.kde.plasma.core 2.0
 
 Item {
     id: openGLErrorView