Merge branch 'master' into v8-clean

Conflicts:
	src/declarative/qml/qdeclarativevme.cpp

Change-Id: I0bbc12c06d40c70433730cb33c4e9b461520263f

2 files changed, 6 insertions, 9 deletions

diff --git a/src/declarative/debugger/qdeclarativeinspectorservice.cpp b/src/declarative/debugger/qdeclarativeinspectorservice.cpp
index 9fec006f56..f1ae354066 100644
--- a/src/declarative/debugger/qdeclarativeinspectorservice.cpp
+++ b/src/declarative/debugger/qdeclarativeinspectorservice.cpp
@@ -47,8 +47,6 @@
 #include <QtCore/QDir>
 #include <QtCore/QPluginLoader>
 
-#include <QtDeclarative/QDeclarativeView>
-
 QT_BEGIN_NAMESPACE
 
 Q_GLOBAL_STATIC(QDeclarativeInspectorService, serviceInstance)
@@ -64,12 +62,12 @@ QDeclarativeInspectorService *QDeclarativeInspectorService::instance()
     return serviceInstance();
 }
 
-void QDeclarativeInspectorService::addView(QDeclarativeView *view)
+void QDeclarativeInspectorService::addView(QObject *view)
 {
     m_views.append(view);
 }
 
-void QDeclarativeInspectorService::removeView(QDeclarativeView *view)
+void QDeclarativeInspectorService::removeView(QObject *view)
 {
     m_views.removeAll(view);
 }
diff --git a/src/declarative/debugger/qdeclarativeinspectorservice_p.h b/src/declarative/debugger/qdeclarativeinspectorservice_p.h
index 9fe0d601fa..db94103210 100644
--- a/src/declarative/debugger/qdeclarativeinspectorservice_p.h
+++ b/src/declarative/debugger/qdeclarativeinspectorservice_p.h
@@ -53,7 +53,6 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 
-class QDeclarativeView;
 class QDeclarativeInspectorInterface;
 
 class Q_DECLARATIVE_EXPORT QDeclarativeInspectorService : public QDeclarativeDebugService
@@ -64,9 +63,9 @@ public:
     QDeclarativeInspectorService();
     static QDeclarativeInspectorService *instance();
 
-    void addView(QDeclarativeView *);
-    void removeView(QDeclarativeView *);
-    QList<QDeclarativeView*> views() const { return m_views; }
+    void addView(QObject *);
+    void removeView(QObject *);
+    QList<QObject*> views() const { return m_views; }
 
     void sendMessage(const QByteArray &message);
 
@@ -80,7 +79,7 @@ protected:
 private:
     static QDeclarativeInspectorInterface *loadInspectorPlugin();
 
-    QList<QDeclarativeView*> m_views;
+    QList<QObject*> m_views;
     QDeclarativeInspectorInterface *m_inspectorPlugin;
 };