QmlDesigner: Get rid of one private header includes

src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp

@@ -29,7 +29,6 @@
 
 #include "basicwidgets.h"
 #include <qlayoutobject.h>
-//#include <private/graphicswidgets_p.h>
 #include <QDeclarativeContext>
 #include <QDeclarativeEngine>
 #include <QDeclarativeComponent>

src/plugins/qmldesigner/core/instances/dummynodeinstance.cpp

@@ -29,7 +29,6 @@
 
 #include "dummynodeinstance.h"
 
-#include <private/qdeclarativemetatype_p.h>
 #include <nodemetainfo.h>
 
 #include <invalidnodeinstanceexception.h>

src/plugins/qmldesigner/core/instances/graphicsscenenodeinstance.cpp

@@ -29,8 +29,6 @@
 
 #include "graphicsscenenodeinstance.h"
 
-#include <private/qdeclarativemetatype_p.h>
-
 #include "graphicsviewnodeinstance.h"
 
 #include <invalidnodeinstanceexception.h>

src/plugins/qmldesigner/core/instances/graphicsviewnodeinstance.cpp

@@ -29,7 +29,6 @@
 
 #include "graphicsviewnodeinstance.h"
 
-#include <private/qdeclarativemetatype_p.h>
 #include <QDeclarativeEngine>
 #include <invalidnodeinstanceexception.h>
 

src/plugins/qmldesigner/core/instances/graphicswidgetnodeinstance.cpp

@@ -32,8 +32,6 @@
 
 #include "objectnodeinstance.h"
 
-#include <private/qdeclarativemetatype_p.h>
-
 #include <invalidnodeinstanceexception.h>
 #include <propertymetainfo.h>
 

src/plugins/qmldesigner/core/instances/nodeinstancesignalspy.cpp

@@ -4,7 +4,6 @@
 #include <QMetaProperty>
 #include <QMetaObject>
 #include <QtDebug>
-#include <private/qdeclarativeproperty_p.h>
 
 #include "objectnodeinstance.h"
 #include <QSharedPointer>

src/plugins/qmldesigner/core/instances/nodeinstanceview.cpp

@@ -29,15 +29,14 @@
 
 #include "nodeinstanceview.h"
 
-#include <QtDeclarative/QDeclarativeEngine>
-#include <QtDeclarative/QDeclarativeContext>
+#include <QDeclarativeEngine>
+#include <QDeclarativeContext>
 
 #include <QtDebug>
 #include <QUrl>
 #include <QGraphicsView>
 #include <QGraphicsScene>
 #include <QGraphicsObject>
-#include <private/qdeclarativeengine_p.h>
 
 #include <model.h>
 #include <modelnode.h>

src/plugins/qmldesigner/core/instances/objectnodeinstance.cpp

@@ -57,18 +57,6 @@
 #include <QSharedPointer>
 
 #include <private/qdeclarativebinding_p.h>
-#include <private/qdeclarativecontext_p.h>
-#include <private/qdeclarativelistaccessor_p.h>
-#include <private/qdeclarativevaluetype_p.h>
-#include <private/qdeclarativeanchors_p.h>
-#include <private/qdeclarativerectangle_p.h> // to get QDeclarativePen
-#include <private/qmetaobjectbuilder_p.h>
-#include <private/qdeclarativevmemetaobject_p.h>
-#include <private/qdeclarativemetatype_p.h>
-#include <private/qobject_p.h>
-#include <private/qdeclarativeproperty_p.h>
-
-
 
 namespace QmlDesigner {
 namespace Internal {

src/plugins/qmldesigner/core/instances/proxywidgetnodeinstance.cpp

@@ -29,8 +29,6 @@
 
 #include "proxywidgetnodeinstance.h"
 
-#include <private/qdeclarativemetatype_p.h>
-
 #include <QGraphicsProxyWidget>
 
 namespace QmlDesigner {

src/plugins/qmldesigner/core/instances/qmlstatenodeinstance.h

@@ -31,7 +31,9 @@
 #define QMLSTATENODEINSTANCE_H
 
 #include "objectnodeinstance.h"
-#include <private/qdeclarativestate_p.h>
+
+class QDeclarativeState;
+class QDeclarativeStateGroup;
 
 namespace QmlDesigner {
 

src/plugins/qmldesigner/core/instances/qmlviewnodeinstance.cpp

@@ -29,8 +29,6 @@
 
 #include "qmlviewnodeinstance.h"
 
-
-#include <private/qdeclarativemetatype_p.h>
 #include <QDeclarativeView>
 #include <QDeclarativeItem>
 

src/plugins/qmldesigner/core/instances/widgetnodeinstance.cpp

@@ -29,8 +29,6 @@
 
 #include "widgetnodeinstance.h"
 
-#include <private/qdeclarativemetatype_p.h>
-
 #include "proxywidgetnodeinstance.h"
 #include <invalidnodeinstanceexception.h>
 

src/plugins/qmldesigner/core/metainfo/metainfo.cpp

@@ -45,6 +45,7 @@
 #include <QtAlgorithms>
 #include <QMetaProperty>
 #include <QDeclarativeEngine>
+
 #include <private/qdeclarativemetatype_p.h>
 #include <private/qdeclarativeanchors_p.h>
 

src/plugins/qmldesigner/core/metainfo/nodemetainfo.cpp

@@ -36,14 +36,14 @@
 #include "metainfo.h"
 #include "propertymetainfo.h"
 
-#include <QtCore/QSharedData>
-#include <QtCore/QtDebug>
-#include <QtGui/QIcon>
-#include <QtDeclarative/private/qdeclarativemetatype_p.h>
-#include <QtDeclarative/QDeclarativeContext>
-#include <QtDeclarative/QDeclarativeEngine>
-#include <QtDeclarative/QDeclarativeComponent>
-#include <private/qdeclarativevaluetype_p.h>
+#include <QSharedData>
+#include <QtDebug>
+#include <QIcon>
+#include <QDeclarativeContext>
+#include <QDeclarativeEngine>
+#include <QDeclarativeComponent>
+
+#include <private/qdeclarativemetatype_p.h>
 
 namespace QmlDesigner {
 

src/plugins/qmldesigner/core/metainfo/propertymetainfo.cpp

@@ -34,6 +34,7 @@
 #include "invalidmetainfoexception.h"
 #include "metainfo.h"
 #include "modelnode.h"
+
 #include <private/qdeclarativevaluetype_p.h>
 #include <private/qdeclarativestringconverters_p.h>
 

src/plugins/qmldesigner/core/model/propertyparser.cpp

@@ -28,12 +28,14 @@
 **************************************************************************/
 
 #include "propertyparser.h"
-#include <QUrl>
-#include <QtCore/QDebug>
-#include <QtDeclarative/private/qdeclarativestringconverters_p.h>
 #include <modelnode.h>
 #include <metainfo.h>
 
+#include <QUrl>
+#include <QDebug>
+
+#include <private/qdeclarativestringconverters_p.h>
+
 namespace QmlDesigner {
 namespace Internal {
 namespace PropertyParser {