QmlDesigner: removing declarative dependency from plugins

The depedency on declarative is unnecessary. Change-Id: I2b48bbb109c593ee4a7a2b5f225c57fad3e93bd8 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>

QmlDesigner: removing declarative dependency from plugins
The depedency on declarative is unnecessary. Change-Id: I2b48bbb109c593ee4a7a2b5f225c57fad3e93bd8 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
f488c59f · Thomas Hartmann · 996122b7 · f488c59f · f488c59f · f488c59f
Commit f488c59f authored Sep 25, 2012 by Thomas Hartmann
9 changed files
--- a/src/plugins/qmldesigner/customstyleplugin/customstyleplugin.h
+++ b/src/plugins/qmldesigner/customstyleplugin/customstyleplugin.h
@@ -32,7 +32,6 @@
 #define CUSTOMSTYLEPLUGIN_H

 #include <iwidgetplugin.h>
-#include <qdeclarative.h>

 namespace QmlDesigner {


--- a/src/plugins/qmldesigner/desktopplugin/desktopplugin.h
+++ b/src/plugins/qmldesigner/desktopplugin/desktopplugin.h
@@ -32,7 +32,6 @@
 #define DESKTOPPLUGIN_H

 #include <iwidgetplugin.h>
-#include <qdeclarative.h>

 QT_BEGIN_NAMESPACE
 QT_END_NAMESPACE

--- a/src/plugins/qmldesigner/desktopplugin/desktopplugin.pri
+++ b/src/plugins/qmldesigner/desktopplugin/desktopplugin.pri
@@ -2,9 +2,6 @@ TARGET = desktopplugin
 TEMPLATE = lib
 CONFIG += plugin

-QT += script \
-      declarative
-
 include (../designercore/iwidgetplugin.pri)

 SOURCES += $$PWD/desktopplugin.cpp

--- a/src/plugins/qmldesigner/extrasplugin/extrasplugin.h
+++ b/src/plugins/qmldesigner/extrasplugin/extrasplugin.h
@@ -32,7 +32,6 @@
 #define EXTRASPLUGIN_H

 #include <iwidgetplugin.h>
-#include <qdeclarative.h>

 namespace QmlDesigner {


--- a/src/plugins/qmldesigner/extrasplugin/extrasplugin.pri
+++ b/src/plugins/qmldesigner/extrasplugin/extrasplugin.pri
@@ -2,9 +2,6 @@ TARGET = extrasplugin
 TEMPLATE = lib
 CONFIG += plugin

-QT += script \
-      declarative
-
 include (../designercore/iwidgetplugin.pri)

 SOURCES += $$PWD/extrasplugin.cpp

--- a/src/plugins/qmldesigner/meegoplugin/meegoplugin.pri
+++ b/src/plugins/qmldesigner/meegoplugin/meegoplugin.pri
@@ -2,9 +2,6 @@ TARGET = meegoplugin
 TEMPLATE = lib
 CONFIG += plugin

-QT += script \
-      declarative
-
 include (../designercore/iwidgetplugin.pri)

 SOURCES += $$PWD/meegoplugin.cpp

--- a/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.cpp
+++ b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.cpp
@@ -31,8 +31,6 @@
 #include "qtquickplugin.h"
 #include <widgetplugin_helper.h>
 #include <QtPlugin>
-#include <private/qdeclarativerectangle_p.h>
-#include <private/qdeclarativescalegrid_p_p.h>

 namespace QmlDesigner {

@@ -40,8 +38,6 @@ namespace QmlDesigner {
 QtQuickPlugin::QtQuickPlugin()
 {

-    qmlRegisterType<QDeclarativePen>("Qt", 4, 7, "Pen");
-    qmlRegisterType<QDeclarativeScaleGrid>("Qt", 4, 7, "ScaleGrid");
 }

 QString QtQuickPlugin::pluginName() const

--- a/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.h
+++ b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.h
@@ -32,7 +32,6 @@
 #define QTQUICKPLUGIN_H

 #include <iwidgetplugin.h>
-#include <qdeclarative.h>

 QT_BEGIN_NAMESPACE
 QT_END_NAMESPACE

--- a/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.pri
+++ b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.pri
@@ -2,9 +2,6 @@ TARGET = qtquickplugin
 TEMPLATE = lib
 CONFIG += plugin

-QT += script \
-      declarative
-
 include (../designercore/iwidgetplugin.pri)

 DEFINES += QTQUICK_LIBRARY