Debugger: Split inspector plugin into a qtquick1 and a qtquick2 plugin

This allows the inspector to be used also when e.g. qtquick1 and widgets libraries
are not available.

Change-Id: Id8510ea2a1a9c2a776d67e6d7732a4e40363d5a3
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>

45 files changed, 358 insertions, 101 deletions

diff --git a/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro b/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro
deleted file mode 100644
index 0c870bbf2d..0000000000
--- a/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro
+++ /dev/null
@@ -1,57 +0,0 @@
-load(qt_module)
-
-TARGET = qmldbg_inspector
-QT       += declarative-private core-private gui-private opengl-private qtquick1 widgets widgets-private v8-private
-
-load(qt_plugin)
-
-DESTDIR  = $$QT.declarative.plugins/qmltooling
-QTDIR_build:REQUIRES += "contains(QT_CONFIG, declarative)"
-
-INCLUDEPATH *= $$PWD
-
-SOURCES += \
-    abstractviewinspector.cpp \
-    qdeclarativeinspectorplugin.cpp \
-    qtquick1/qdeclarativeviewinspector.cpp \
-    qtquick1/abstractliveedittool.cpp \
-    qtquick1/liveselectiontool.cpp \
-    qtquick1/livelayeritem.cpp \
-    qtquick1/livesingleselectionmanipulator.cpp \
-    qtquick1/liverubberbandselectionmanipulator.cpp \
-    qtquick1/liveselectionrectangle.cpp \
-    qtquick1/liveselectionindicator.cpp \
-    qtquick1/boundingrecthighlighter.cpp \
-    qtquick1/subcomponentmasklayeritem.cpp \
-    qtquick1/zoomtool.cpp \
-    qtquick1/colorpickertool.cpp \
-    abstracttool.cpp \
-    sgviewinspector.cpp \
-    sgselectiontool.cpp \
-    sghighlight.cpp
-
-HEADERS += \
-    abstractviewinspector.h \
-    qdeclarativeinspectorplugin.h \
-    qdeclarativeinspectorprotocol.h \
-    qmlinspectorconstants.h \
-    qtquick1/qdeclarativeviewinspector.h \
-    qtquick1/qdeclarativeviewinspector_p.h \
-    qtquick1/abstractliveedittool.h \
-    qtquick1/liveselectiontool.h \
-    qtquick1/livelayeritem.h \
-    qtquick1/livesingleselectionmanipulator.h \
-    qtquick1/liverubberbandselectionmanipulator.h \
-    qtquick1/liveselectionrectangle.h \
-    qtquick1/liveselectionindicator.h \
-    qtquick1/boundingrecthighlighter.h \
-    qtquick1/subcomponentmasklayeritem.h \
-    qtquick1/zoomtool.h \
-    qtquick1/colorpickertool.h \
-    abstracttool.h \
-    sgviewinspector.h \
-    sgselectiontool.h \
-    sghighlight.h
-
-target.path += $$[QT_INSTALL_PLUGINS]/qmltooling
-INSTALLS += target
diff --git a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/abstractliveedittool.cpp b/src/plugins/qmltooling/qmldbg_qtquick1/abstractliveedittool.cpp
index c2482929ca..09a39d6520 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/abstractliveedittool.cpp
+++ b/src/plugins/qmltooling/qmldbg_qtquick1/abstractliveedittool.cpp
@@ -49,6 +49,7 @@
 #include <QDeclarativeItem>
 
 namespace QmlJSDebugger {
+namespace QtQuick1 {
 
 AbstractLiveEditTool::AbstractLiveEditTool(QDeclarativeViewInspector *editorView)
     : AbstractTool(editorView)
@@ -192,5 +193,5 @@ QString AbstractLiveEditTool::titleForItem(QGraphicsItem *item)
     return constructedName;
 }
 
-
+} // namespace QtQuick1
 } // namespace QmlJSDebugger
diff --git a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/abstractliveedittool.h b/src/plugins/qmltooling/qmldbg_qtquick1/abstractliveedittool.h
index 04b5f4e46e..fd57076d0c 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/abstractliveedittool.h
+++ b/src/plugins/qmltooling/qmldbg_qtquick1/abstractliveedittool.h
@@ -43,7 +43,7 @@
 #define ABSTRACTLIVEEDITTOOL_H
 
 #include <QtCore/QList>
-#include "../abstracttool.h"
+#include "abstracttool.h"
 
 QT_BEGIN_NAMESPACE
 class QMouseEvent;
@@ -57,6 +57,7 @@ class QDeclarativeView;
 QT_END_NAMESPACE
 
 namespace QmlJSDebugger {
+namespace QtQuick1 {
 
 class QDeclarativeViewInspector;
 
@@ -99,6 +100,7 @@ private:
     QList<QGraphicsItem*> m_itemList;
 };
 
-}
+} // namespace QtQuick1
+} // namesacpe QmlJSDebugger
 
 #endif // ABSTRACTLIVEEDITTOOL_H
diff --git a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/boundingrecthighlighter.cpp b/src/plugins/qmltooling/qmldbg_qtquick1/boundingrecthighlighter.cpp
index e097d3cd77..7cf1e83520 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/boundingrecthighlighter.cpp
+++ b/src/plugins/qmltooling/qmldbg_qtquick1/boundingrecthighlighter.cpp
@@ -42,7 +42,7 @@
 #include "boundingrecthighlighter.h"
 
 #include "qdeclarativeviewinspector.h"
-#include "../qmlinspectorconstants.h"
+#include "qmlinspectorconstants.h"
 
 #include <QtWidgets/QGraphicsPolygonItem>
 
@@ -51,6 +51,7 @@
 #include <QtCore/QDebug>
 
 namespace QmlJSDebugger {
+namespace QtQuick1 {
 
 BoundingBox::BoundingBox(QGraphicsObject *itemToHighlight, QGraphicsItem *parentItem,
                          QObject *parent)
@@ -236,5 +237,5 @@ void BoundingRectHighlighter::refresh()
         highlightAll();
 }
 
-
+} // namespace QtQuick1
 } // namespace QmlJSDebugger
diff --git a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/boundingrecthighlighter.h b/src/plugins/qmltooling/qmldbg_qtquick1/boundingrecthighlighter.h
index 81883ee0aa..e99197f06d 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/boundingrecthighlighter.h
+++ b/src/plugins/qmltooling/qmldbg_qtquick1/boundingrecthighlighter.h
@@ -54,6 +54,7 @@ QT_FORWARD_DECLARE_CLASS(QStyleOptionGraphicsItem)
 QT_FORWARD_DECLARE_CLASS(QTimer)
 
 namespace QmlJSDebugger {
+namespace QtQuick1 {
 
 class QDeclarativeViewInspector;
 class BoundingBox;
@@ -110,6 +111,7 @@ public:
     int type() const;
 };
 
+} // namespace QtQuick1
 } // namespace QmlJSDebugger
 
 #endif // BOUNDINGRECTHIGHLIGHTER_H
diff --git a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/colorpickertool.cpp b/src/plugins/qmltooling/qmldbg_qtquick1/colorpickertool.cpp
index 581c1f5b1a..3372f9c8e6 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/colorpickertool.cpp
+++ b/src/plugins/qmltooling/qmldbg_qtquick1/colorpickertool.cpp
@@ -52,6 +52,7 @@
 #include <QtGui/QPalette>
 
 namespace QmlJSDebugger {
+namespace QtQuick1 {
 
 ColorPickerTool::ColorPickerTool(QDeclarativeViewInspector *view) :
     AbstractLiveEditTool(view)
@@ -95,4 +96,5 @@ void ColorPickerTool::pickColor(const QPoint &pos)
     emit selectedColorChanged(m_selectedColor);
 }
 
+} // namespace QtQuick1
 } // namespace QmlJSDebugger
diff --git a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/colorpickertool.h b/src/plugins/qmltooling/qmldbg_qtquick1/colorpickertool.h
index a28ffea63a..7e86b015eb 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/colorpickertool.h
+++ b/src/plugins/qmltooling/qmldbg_qtquick1/colorpickertool.h
@@ -49,6 +49,7 @@
 QT_FORWARD_DECLARE_CLASS(QPoint)
 
 namespace QmlJSDebugger {
+namespace QtQuick1 {
 
 class ColorPickerTool : public AbstractLiveEditTool
 {
@@ -87,6 +88,7 @@ private:
     QColor m_selectedColor;
 };
 
+} // namespace QtQuick1
 } // namespace QmlJSDebugger
 
 #endif // COLORPICKERTOOL_H
diff --git a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/livelayeritem.cpp b/src/plugins/qmltooling/qmldbg_qtquick1/livelayeritem.cpp
index fb7118fbc2..7788eabe26 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/livelayeritem.cpp
+++ b/src/plugins/qmltooling/qmldbg_qtquick1/livelayeritem.cpp
@@ -41,11 +41,12 @@
 
 #include "livelayeritem.h"
 
-#include "../qmlinspectorconstants.h"
+#include "qmlinspectorconstants.h"
 
 #include <QGraphicsScene>
 
 namespace QmlJSDebugger {
+namespace QtQuick1 {
 
 LiveLayerItem::LiveLayerItem(QGraphicsScene* scene)
     : QGraphicsObject()
@@ -89,4 +90,5 @@ QList<QGraphicsItem*> LiveLayerItem::findAllChildItems(const QGraphicsItem *item
     return itemList;
 }
 
+} // namespace QtQuick1
 } // namespace QmlJSDebugger
diff --git a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/livelayeritem.h b/src/plugins/qmltooling/qmldbg_qtquick1/livelayeritem.h
index 15f9a27fa4..d819cae8c6 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/livelayeritem.h
+++ b/src/plugins/qmltooling/qmldbg_qtquick1/livelayeritem.h
@@ -45,6 +45,7 @@
 #include <QtWidgets/QGraphicsObject>
 
 namespace QmlJSDebugger {
+namespace QtQuick1 {
 
 class LiveLayerItem : public QGraphicsObject
 {
@@ -62,6 +63,7 @@ protected:
     QList<QGraphicsItem*> findAllChildItems(const QGraphicsItem *item) const;
 };
 
-}
+} // namespace QtQuick1
+} // namespace QmlJSDebugger
 
 #endif // LIVELAYERITEM_H
diff --git a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/liverubberbandselectionmanipulator.cpp b/src/plugins/qmltooling/qmldbg_qtquick1/liverubberbandselectionmanipulator.cpp
index 4987237f89..cfa0d4ff1a 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/liverubberbandselectionmanipulator.cpp
+++ b/src/plugins/qmltooling/qmldbg_qtquick1/liverubberbandselectionmanipulator.cpp
@@ -48,6 +48,7 @@
 #include <QtCore/QDebug>
 
 namespace QmlJSDebugger {
+namespace QtQuick1 {
 
 LiveRubberBandSelectionManipulator::LiveRubberBandSelectionManipulator(QGraphicsObject *layerItem,
                                                                        QDeclarativeViewInspector *editorView)
@@ -162,4 +163,5 @@ bool LiveRubberBandSelectionManipulator::isActive() const
     return m_isActive;
 }
 
+} // namespace QtQuick1
 } // namespace QmlJSDebugger
diff --git a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/liverubberbandselectionmanipulator.h b/src/plugins/qmltooling/qmldbg_qtquick1/liverubberbandselectionmanipulator.h
index aa15a34730..092e852679 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/liverubberbandselectionmanipulator.h
+++ b/src/plugins/qmltooling/qmldbg_qtquick1/liverubberbandselectionmanipulator.h
@@ -49,6 +49,7 @@
 QT_FORWARD_DECLARE_CLASS(QGraphicsItem)
 
 namespace QmlJSDebugger {
+namespace QtQuick1 {
 
 class QDeclarativeViewInspector;
 
@@ -91,6 +92,7 @@ private:
     bool m_isActive;
 };
 
-}
+} // namespace QtQuick1
+} // namespace QmlJSDebugger
 
 #endif // RUBBERBANDSELECTIONMANIPULATOR_H
diff --git a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/liveselectionindicator.cpp b/src/plugins/qmltooling/qmldbg_qtquick1/liveselectionindicator.cpp
index 744cbf527e..0c3f47e534 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/liveselectionindicator.cpp
+++ b/src/plugins/qmltooling/qmldbg_qtquick1/liveselectionindicator.cpp
@@ -42,7 +42,7 @@
 #include "liveselectionindicator.h"
 
 #include "qdeclarativeviewinspector_p.h"
-#include "../qmlinspectorconstants.h"
+#include "qmlinspectorconstants.h"
 
 #include <QtWidgets/QGraphicsRectItem>
 #include <QtWidgets/QGraphicsObject>
@@ -50,6 +50,7 @@
 #include <QtGui/QPen>
 
 namespace QmlJSDebugger {
+namespace QtQuick1 {
 
 LiveSelectionIndicator::LiveSelectionIndicator(QDeclarativeViewInspector *viewInspector,
                                                QGraphicsObject *layerItem)
@@ -114,5 +115,6 @@ void LiveSelectionIndicator::setItems(const QList<QWeakPointer<QGraphicsObject>
     }
 }
 
-} //namespace QmlJSDebugger
+} // namespace QtQuick1
+} // namespace QmlJSDebugger
 
diff --git a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/liveselectionindicator.h b/src/plugins/qmltooling/qmldbg_qtquick1/liveselectionindicator.h
index 7b8cc12e62..db57834e95 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/liveselectionindicator.h
+++ b/src/plugins/qmltooling/qmldbg_qtquick1/liveselectionindicator.h
@@ -53,6 +53,7 @@ class QPolygonF;
 QT_END_NAMESPACE
 
 namespace QmlJSDebugger {
+namespace QtQuick1 {
 
 class QDeclarativeViewInspector;
 
@@ -75,6 +76,7 @@ private:
     QDeclarativeViewInspector *m_view;
 };
 
-}
+} // namespace QtQuick1
+} // namespace QmlJSDebugger
 
 #endif // LIVESELECTIONINDICATOR_H
diff --git a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/liveselectionrectangle.cpp b/src/plugins/qmltooling/qmldbg_qtquick1/liveselectionrectangle.cpp
index 23577561a4..a867aa6daf 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/liveselectionrectangle.cpp
+++ b/src/plugins/qmltooling/qmldbg_qtquick1/liveselectionrectangle.cpp
@@ -41,7 +41,7 @@
 
 #include "liveselectionrectangle.h"
 
-#include "../qmlinspectorconstants.h"
+#include "qmlinspectorconstants.h"
 
 #include <QtGui/QPen>
 #include <QtWidgets/QGraphicsRectItem>
@@ -53,6 +53,7 @@
 #include <cmath>
 
 namespace QmlJSDebugger {
+namespace QtQuick1 {
 
 class SelectionRectShape : public QGraphicsRectItem
 {
@@ -110,4 +111,5 @@ void LiveSelectionRectangle::setRect(const QPointF &firstPoint,
     m_controlShape->setRect(rect);
 }
 
-}
+} // namespace QtQuick1
+} // namespace QmlJSDebugger
diff --git a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/liveselectionrectangle.h b/src/plugins/qmltooling/qmldbg_qtquick1/liveselectionrectangle.h
index 730cca52d5..17eeda765b 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/liveselectionrectangle.h
+++ b/src/plugins/qmltooling/qmldbg_qtquick1/liveselectionrectangle.h
@@ -50,6 +50,7 @@ QT_FORWARD_DECLARE_CLASS(QPointF)
 QT_FORWARD_DECLARE_CLASS(QRectF)
 
 namespace QmlJSDebugger {
+namespace QtQuick1 {
 
 class LiveSelectionRectangle
 {
@@ -72,6 +73,7 @@ private:
     QWeakPointer<QGraphicsObject> m_layerItem;
 };
 
+} // namespace QtQuick1
 } // namespace QmlJSDebugger
 
 #endif // LIVESELECTIONRECTANGLE_H
diff --git a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/liveselectiontool.cpp b/src/plugins/qmltooling/qmldbg_qtquick1/liveselectiontool.cpp
index dc51a1f595..5307409272 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/liveselectiontool.cpp
+++ b/src/plugins/qmltooling/qmldbg_qtquick1/liveselectiontool.cpp
@@ -58,6 +58,7 @@
 #include <QtCore/QDebug>
 
 namespace QmlJSDebugger {
+namespace QtQuick1 {
 
 LiveSelectionTool::LiveSelectionTool(QDeclarativeViewInspector *editorView) :
     AbstractLiveEditTool(editorView),
@@ -420,4 +421,5 @@ void LiveSelectionTool::selectUnderPoint(QMouseEvent *event)
     m_singleSelectionManipulator.end(event->pos());
 }
 
+} // namespace QtQuick1
 } // namespace QmlJSDebugger
diff --git a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/liveselectiontool.h b/src/plugins/qmltooling/qmldbg_qtquick1/liveselectiontool.h
index 2c281cda3c..b6a9aacd0e 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/liveselectiontool.h
+++ b/src/plugins/qmltooling/qmldbg_qtquick1/liveselectiontool.h
@@ -56,6 +56,7 @@ QT_FORWARD_DECLARE_CLASS(QKeyEvent)
 QT_FORWARD_DECLARE_CLASS(QAction)
 
 namespace QmlJSDebugger {
+namespace QtQuick1 {
 
 class LiveSelectionTool : public AbstractLiveEditTool
 {
@@ -115,6 +116,7 @@ private:
     QList<QGraphicsItem*> m_contextMenuItemList;
 };
 
+} // namespace QtQuick1
 } // namespace QmlJSDebugger
 
 #endif // LIVESELECTIONTOOL_H
diff --git a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/livesingleselectionmanipulator.cpp b/src/plugins/qmltooling/qmldbg_qtquick1/livesingleselectionmanipulator.cpp
index 9c78018ef9..c07e3fae28 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/livesingleselectionmanipulator.cpp
+++ b/src/plugins/qmltooling/qmldbg_qtquick1/livesingleselectionmanipulator.cpp
@@ -46,6 +46,7 @@
 #include <QtDebug>
 
 namespace QmlJSDebugger {
+namespace QtQuick1 {
 
 LiveSingleSelectionManipulator::LiveSingleSelectionManipulator(QDeclarativeViewInspector *editorView)
     : m_editorView(editorView),
@@ -148,4 +149,5 @@ QPointF LiveSingleSelectionManipulator::beginPoint() const
     return m_beginPoint;
 }
 
+} // namespace QtQuick1
 } // namespace QmlJSDebugger
diff --git a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/livesingleselectionmanipulator.h b/src/plugins/qmltooling/qmldbg_qtquick1/livesingleselectionmanipulator.h
index ac65711a91..80923a06ce 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/livesingleselectionmanipulator.h
+++ b/src/plugins/qmltooling/qmldbg_qtquick1/livesingleselectionmanipulator.h
@@ -48,6 +48,7 @@
 QT_FORWARD_DECLARE_CLASS(QGraphicsItem)
 
 namespace QmlJSDebugger {
+namespace QtQuick1 {
 
 class QDeclarativeViewInspector;
 
@@ -84,6 +85,7 @@ private:
     bool m_isActive;
 };
 
+} // namespace QtQuick1
 } // namespace QmlJSDebugger
 
 #endif // LIVESINGLESELECTIONMANIPULATOR_H
diff --git a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/qdeclarativeviewinspector.cpp b/src/plugins/qmltooling/qmldbg_qtquick1/qdeclarativeviewinspector.cpp
index ca34f9e029..27d252a9ec 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/qdeclarativeviewinspector.cpp
+++ b/src/plugins/qmltooling/qmldbg_qtquick1/qdeclarativeviewinspector.cpp
@@ -52,6 +52,7 @@
 #include <QtGui/QMouseEvent>
 
 namespace QmlJSDebugger {
+namespace QtQuick1 {
 
 QDeclarativeViewInspectorPrivate::QDeclarativeViewInspectorPrivate(QDeclarativeViewInspector *q) :
     q(q)
@@ -442,4 +443,5 @@ QRectF QDeclarativeViewInspector::adjustToScreenBoundaries(const QRectF &boundin
     return boundingRect;
 }
 
+} // namespace QtQuick1
 } // namespace QmlJSDebugger
diff --git a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/qdeclarativeviewinspector.h b/src/plugins/qmltooling/qmldbg_qtquick1/qdeclarativeviewinspector.h
index 5ac6b42eef..f430aa7b65 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/qdeclarativeviewinspector.h
+++ b/src/plugins/qmltooling/qmldbg_qtquick1/qdeclarativeviewinspector.h
@@ -50,6 +50,7 @@
 #include <QtQuick1/QDeclarativeView>
 
 namespace QmlJSDebugger {
+namespace QtQuick1 {
 
 class AbstractLiveEditTool;
 class QDeclarativeViewInspectorPrivate;
@@ -95,6 +96,7 @@ private:
     friend class AbstractLiveEditTool;
 };
 
+} // namespace QtQuick1
 } // namespace QmlJSDebugger
 
 #endif // QDECLARATIVEVIEWINSPECTOR_H
diff --git a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/qdeclarativeviewinspector_p.h b/src/plugins/qmltooling/qmldbg_qtquick1/qdeclarativeviewinspector_p.h
index a51f155404..98dc03f84a 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/qdeclarativeviewinspector_p.h
+++ b/src/plugins/qmltooling/qmldbg_qtquick1/qdeclarativeviewinspector_p.h
@@ -52,6 +52,7 @@
 #include "QtDeclarative/private/qdeclarativeinspectorservice_p.h"
 
 namespace QmlJSDebugger {
+namespace QtQuick1 {
 
 class QDeclarativeViewInspector;
 class LiveSelectionTool;
@@ -114,6 +115,7 @@ public:
     static QDeclarativeViewInspectorPrivate *get(QDeclarativeViewInspector *v) { return v->d_func(); }
 };
 
+} // namespace QtQuick1
 } // namespace QmlJSDebugger
 
 #endif // QDECLARATIVEVIEWINSPECTOR_P_H
diff --git a/src/plugins/qmltooling/qmldbg_qtquick1/qmldbg_qtquick1.pro b/src/plugins/qmltooling/qmldbg_qtquick1/qmldbg_qtquick1.pro
new file mode 100644
index 0000000000..1b0229decc
--- /dev/null
+++ b/src/plugins/qmltooling/qmldbg_qtquick1/qmldbg_qtquick1.pro
@@ -0,0 +1,50 @@
+load(qt_module)
+
+TARGET = qmldbg_qtquick1
+QT       += declarative-private core-private gui-private widget-private qtquick1 opengl-private
+
+load(qt_plugin)
+
+DESTDIR  = $$QT.declarative.plugins/qmltooling
+
+INCLUDEPATH *= $$PWD $$PWD/../shared
+
+SOURCES += \
+    abstractliveedittool.cpp \
+    boundingrecthighlighter.cpp \
+    colorpickertool.cpp \
+    livelayeritem.cpp \
+    liverubberbandselectionmanipulator.cpp \
+    liveselectionindicator.cpp \
+    liveselectionrectangle.cpp \
+    liveselectiontool.cpp \
+    livesingleselectionmanipulator.cpp \
+    qdeclarativeviewinspector.cpp \
+    qtquick1plugin.cpp \
+    ../shared/abstracttool.cpp \
+    ../shared/abstractviewinspector.cpp \
+    subcomponentmasklayeritem.cpp \
+    zoomtool.cpp
+
+HEADERS += \
+    abstractliveedittool.h \
+    boundingrecthighlighter.h \
+    colorpickertool.h \
+    livelayeritem.h \
+    liverubberbandselectionmanipulator.h \
+    liveselectionindicator.h \
+    liveselectionrectangle.h \
+    liveselectiontool.h \
+    livesingleselectionmanipulator.h \
+    qdeclarativeviewinspector.h \
+    qdeclarativeviewinspector_p.h \
+    qtquick1plugin.h \
+    ../shared/abstracttool.h \
+    ../shared/abstractviewinspector.h \
+    ../shared/qdeclarativeinspectorprotocol.h \
+    ../shared/qmlinspectorconstants.h \
+    subcomponentmasklayeritem.h \
+    zoomtool.h
+
+target.path += $$[QT_INSTALL_PLUGINS]/qmltooling
+INSTALLS += target
diff --git a/src/plugins/qmltooling/qmldbg_qtquick1/qtquick1plugin.cpp b/src/plugins/qmltooling/qmldbg_qtquick1/qtquick1plugin.cpp
new file mode 100644
index 0000000000..a8ad4074ae
--- /dev/null
+++ b/src/plugins/qmltooling/qmldbg_qtquick1/qtquick1plugin.cpp
@@ -0,0 +1,88 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qtquick1plugin.h"
+#include "qdeclarativeviewinspector.h"
+
+#include <QtCore/qplugin.h>
+#include <QtDeclarative/private/qdeclarativeinspectorservice_p.h>
+#include <QtQuick1/qdeclarativeview.h>
+
+namespace QmlJSDebugger {
+namespace QtQuick1 {
+
+QtQuick1Plugin::QtQuick1Plugin() :
+    m_inspector(0)
+{
+}
+
+QtQuick1Plugin::~QtQuick1Plugin()
+{
+    delete m_inspector;
+}
+
+bool QtQuick1Plugin::canHandleView(QObject *view)
+{
+    return qobject_cast<QDeclarativeView*>(view);
+}
+
+void QtQuick1Plugin::activate(QObject *view)
+{
+    QDeclarativeView *qDeclarativeView = qobject_cast<QDeclarativeView*>(view);
+    Q_ASSERT(qDeclarativeView);
+    m_inspector = new QDeclarativeViewInspector(qDeclarativeView, qDeclarativeView);
+}
+
+void QtQuick1Plugin::deactivate()
+{
+    delete m_inspector;
+}
+
+void QtQuick1Plugin::clientMessage(const QByteArray &message)
+{
+    if (m_inspector)
+        m_inspector->handleMessage(message);
+}
+
+} // namespace QtQuick1
+} // namespace QmlJSDebugger
+
+Q_EXPORT_PLUGIN2(qmldbg_qtquick1, QmlJSDebugger::QtQuick1::QtQuick1Plugin)
diff --git a/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeinspectorplugin.h b/src/plugins/qmltooling/qmldbg_qtquick1/qtquick1plugin.h
index 542925366c..38048740b7 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeinspectorplugin.h
+++ b/src/plugins/qmltooling/qmldbg_qtquick1/qtquick1plugin.h
@@ -49,23 +49,29 @@ namespace QmlJSDebugger {
 
 class AbstractViewInspector;
 
-class QDeclarativeInspectorPlugin : public QObject, public QDeclarativeInspectorInterface
+namespace QtQuick1 {
+
+class QtQuick1Plugin : public QObject, public QDeclarativeInspectorInterface
 {
     Q_OBJECT
-    Q_DISABLE_COPY(QDeclarativeInspectorPlugin)
+    Q_DISABLE_COPY(QtQuick1Plugin)
     Q_INTERFACES(QDeclarativeInspectorInterface)
 
 public:
-    QDeclarativeInspectorPlugin();
-    ~QDeclarativeInspectorPlugin();
+    QtQuick1Plugin();
+    ~QtQuick1Plugin();
 
-    void activate();
+    // QDeclarativeInspectorInterface
+    bool canHandleView(QObject *view);
+    void activate(QObject *view);
     void deactivate();
+    void clientMessage(const QByteArray &message);
 
 private:
     QPointer<AbstractViewInspector> m_inspector;
 };
 
+} // namespace QtQuick1
 } // namespace QmlJSDebugger
 
 #endif // QDECLARATIVEINSPECTORPLUGIN_H
diff --git a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/subcomponentmasklayeritem.cpp b/src/plugins/qmltooling/qmldbg_qtquick1/subcomponentmasklayeritem.cpp
index 4e3aed2fb4..0b1b9f8598 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/subcomponentmasklayeritem.cpp
+++ b/src/plugins/qmltooling/qmldbg_qtquick1/subcomponentmasklayeritem.cpp
@@ -41,12 +41,13 @@
 
 #include "subcomponentmasklayeritem.h"
 
-#include "../qmlinspectorconstants.h"
+#include "qmlinspectorconstants.h"
 #include "qdeclarativeviewinspector.h"
 
 #include <QtGui/QPolygonF>
 
 namespace QmlJSDebugger {
+namespace QtQuick1 {
 
 SubcomponentMaskLayerItem::SubcomponentMaskLayerItem(QDeclarativeViewInspector *inspector,
                                                      QGraphicsItem *parentItem) :
@@ -127,4 +128,5 @@ QGraphicsItem *SubcomponentMaskLayerItem::currentItem() const
     return m_currentItem;
 }
 
+} // namespace QtQuick1
 } // namespace QmlJSDebugger
diff --git a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/subcomponentmasklayeritem.h b/src/plugins/qmltooling/qmldbg_qtquick1/subcomponentmasklayeritem.h
index 72c74663a1..c5f99f0a45 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/subcomponentmasklayeritem.h
+++ b/src/plugins/qmltooling/qmldbg_qtquick1/subcomponentmasklayeritem.h
@@ -45,6 +45,7 @@
 #include <QtWidgets/QGraphicsPolygonItem>
 
 namespace QmlJSDebugger {
+namespace QtQuick1 {
 
 class QDeclarativeViewInspector;
 
@@ -66,6 +67,7 @@ private:
     QRectF m_itemPolyRect;
 };
 
+} // namespace QtQuick1
 } // namespace QmlJSDebugger
 
 #endif // SUBCOMPONENTMASKLAYERITEM_H
diff --git a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/zoomtool.cpp b/src/plugins/qmltooling/qmldbg_qtquick1/zoomtool.cpp
index 92f34b36e8..daf44e23ec 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/zoomtool.cpp
+++ b/src/plugins/qmltooling/qmldbg_qtquick1/zoomtool.cpp
@@ -53,6 +53,7 @@
 #include <QtCore/QDebug>
 
 namespace QmlJSDebugger {
+namespace QtQuick1 {
 
 ZoomTool::ZoomTool(QDeclarativeViewInspector *view) :
     AbstractLiveEditTool(view),
@@ -325,4 +326,5 @@ qreal ZoomTool::nextZoomScale(ZoomDirection direction) const
     return 1.0f;
 }
 
+} // namespace QtQuick1
 } // namespace QmlJSDebugger
diff --git a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/zoomtool.h b/src/plugins/qmltooling/qmldbg_qtquick1/zoomtool.h
index de935591cb..bc26aae894 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/zoomtool.h
+++ b/src/plugins/qmltooling/qmldbg_qtquick1/zoomtool.h
@@ -48,6 +48,7 @@
 QT_FORWARD_DECLARE_CLASS(QAction)
 
 namespace QmlJSDebugger {
+namespace QtQuick1 {
 
 class ZoomTool : public AbstractLiveEditTool
 {
@@ -102,6 +103,7 @@ private:
     qreal m_currentScale;
 };
 
+} // namespace QtQuick1
 } // namespace QmlJSDebugger
 
 #endif // ZOOMTOOL_H
diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/qmldbg_qtquick2.pro b/src/plugins/qmltooling/qmldbg_qtquick2/qmldbg_qtquick2.pro
new file mode 100644
index 0000000000..a06c1bdc10
--- /dev/null
+++ b/src/plugins/qmltooling/qmldbg_qtquick2/qmldbg_qtquick2.pro
@@ -0,0 +1,31 @@
+load(qt_module)
+
+TARGET = qmldbg_qtquick2
+QT       += declarative-private core-private gui-private opengl-private v8-private
+
+load(qt_plugin)
+
+DESTDIR  = $$QT.declarative.plugins/qmltooling
+
+INCLUDEPATH *= $$PWD $$PWD/../shared
+
+SOURCES += \
+    qtquick2plugin.cpp \
+    sghighlight.cpp \
+    sgselectiontool.cpp \
+    sgviewinspector.cpp \
+    ../shared/abstracttool.cpp \
+    ../shared/abstractviewinspector.cpp
+
+HEADERS += \
+    qtquick2plugin.h \
+    sghighlight.h \
+    sgselectiontool.h \
+    sgviewinspector.h \
+    ../shared/abstracttool.h \
+    ../shared/abstractviewinspector.h \
+    ../shared/qdeclarativeinspectorprotocol.h \
+    ../shared/qmlinspectorconstants.h
+
+target.path += $$[QT_INSTALL_PLUGINS]/qmltooling
+INSTALLS += target
diff --git a/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeinspectorplugin.cpp b/src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.cpp
index f4eec5011d..5ed919c87c 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeinspectorplugin.cpp
+++ b/src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.cpp
@@ -39,9 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qdeclarativeinspectorplugin.h"
-
-#include "qtquick1/qdeclarativeviewinspector_p.h"
+#include "qtquick2plugin.h"
 #include "sgviewinspector.h"
 
 #include <QtCore/qplugin.h>
@@ -49,37 +47,42 @@
 #include <QtDeclarative/QQuickView>
 
 namespace QmlJSDebugger {
+namespace QtQuick2 {
 
-QDeclarativeInspectorPlugin::QDeclarativeInspectorPlugin() :
+QtQuick2Plugin::QtQuick2Plugin() :
     m_inspector(0)
 {
 }
 
-QDeclarativeInspectorPlugin::~QDeclarativeInspectorPlugin()
+QtQuick2Plugin::~QtQuick2Plugin()
 {
     delete m_inspector;
 }
 
-void QDeclarativeInspectorPlugin::activate()
+bool QtQuick2Plugin::canHandleView(QObject *view)
 {
-    QDeclarativeInspectorService *service = QDeclarativeInspectorService::instance();
-    QList<QObject*> views = service->views();
-    if (views.isEmpty())
-        return;
+    return qobject_cast<QQuickView*>(view);
+}
 
-    // TODO: Support multiple views
-    QObject *firstView = views.first();
-    if (QDeclarativeView *declarativeView = qobject_cast<QDeclarativeView*>(firstView))
-        m_inspector = new QDeclarativeViewInspector(declarativeView, declarativeView);
-    else if (QQuickView *sgView = qobject_cast<QQuickView*>(firstView))
-        m_inspector = new SGViewInspector(sgView, sgView);
+void QtQuick2Plugin::activate(QObject *view)
+{
+    QQuickView *qtQuickView = qobject_cast<QQuickView*>(view);
+    Q_ASSERT(qtQuickView);
+    m_inspector = new SGViewInspector(qtQuickView, qtQuickView);
 }
 
-void QDeclarativeInspectorPlugin::deactivate()
+void QtQuick2Plugin::deactivate()
 {
     delete m_inspector;
 }
 
+void QtQuick2Plugin::clientMessage(const QByteArray &message)
+{
+    if (m_inspector)
+        m_inspector->handleMessage(message);
+}
+
+} // namespace QtQuick2
 } // namespace QmlJSDebugger
 
-Q_EXPORT_PLUGIN2(declarativeinspector, QmlJSDebugger::QDeclarativeInspectorPlugin)
+Q_EXPORT_PLUGIN2(qmldbg_qtquick2, QmlJSDebugger::QtQuick2::QtQuick2Plugin)
diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.h b/src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.h
new file mode 100644
index 0000000000..89edcad6b7
--- /dev/null
+++ b/src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.h
@@ -0,0 +1,77 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVEINSPECTORPLUGIN_H
+#define QDECLARATIVEINSPECTORPLUGIN_H
+
+#include <QtCore/QPointer>
+#include <QtDeclarative/private/qdeclarativeinspectorinterface_p.h>
+
+namespace QmlJSDebugger {
+
+class AbstractViewInspector;
+
+namespace QtQuick2 {
+
+class QtQuick2Plugin : public QObject, public QDeclarativeInspectorInterface
+{
+    Q_OBJECT
+    Q_DISABLE_COPY(QtQuick2Plugin)
+    Q_INTERFACES(QDeclarativeInspectorInterface)
+
+public:
+    QtQuick2Plugin();
+    ~QtQuick2Plugin();
+
+    // QDeclarativeInspectorInterface
+    bool canHandleView(QObject *view);
+    void activate(QObject *view);
+    void deactivate();
+    void clientMessage(const QByteArray &message);
+
+private:
+    QPointer<AbstractViewInspector> m_inspector;
+};
+
+} // namespace QtQuick2
+} // namespace QmlJSDebugger
+
+#endif // QDECLARATIVEINSPECTORPLUGIN_H
diff --git a/src/plugins/qmltooling/qmldbg_inspector/sghighlight.cpp b/src/plugins/qmltooling/qmldbg_qtquick2/sghighlight.cpp
index 1af789d389..ab254a3fdd 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/sghighlight.cpp
+++ b/src/plugins/qmltooling/qmldbg_qtquick2/sghighlight.cpp
@@ -44,6 +44,7 @@
 #include <QtGui/QPainter>
 
 namespace QmlJSDebugger {
+namespace QtQuick2 {
 
 SGHighlight::SGHighlight(QQuickItem *item, QQuickItem *parent)
     : QQuickPaintedItem(parent)
@@ -95,4 +96,5 @@ void SGHoverHighlight::paint(QPainter *painter)
     painter->drawRect(QRect(0, 0, width() - 1, height() - 1));
 }
 
+} // namespace QtQuick2
 } // namespace QmlJSDebugger
diff --git a/src/plugins/qmltooling/qmldbg_inspector/sghighlight.h b/src/plugins/qmltooling/qmldbg_qtquick2/sghighlight.h
index 8d5659cc5d..8ba1af6576 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/sghighlight.h
+++ b/src/plugins/qmltooling/qmldbg_qtquick2/sghighlight.h
@@ -46,6 +46,7 @@
 #include <QtDeclarative/QQuickPaintedItem>
 
 namespace QmlJSDebugger {
+namespace QtQuick2 {
 
 class SGHighlight : public QQuickPaintedItem
 {
@@ -92,6 +93,7 @@ public:
     void paint(QPainter *painter);
 };
 
+} // namespace QtQuick2
 } // namespace QmlJSDebugger
 
 #endif // SGHIGHLIGHT_H
diff --git a/src/plugins/qmltooling/qmldbg_inspector/sgselectiontool.cpp b/src/plugins/qmltooling/qmldbg_qtquick2/sgselectiontool.cpp
index bdfc28f5ec..025aa2d603 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/sgselectiontool.cpp
+++ b/src/plugins/qmltooling/qmldbg_qtquick2/sgselectiontool.cpp
@@ -50,6 +50,7 @@
 #include <QtDeclarative/QQuickItem>
 
 namespace QmlJSDebugger {
+namespace QtQuick2 {
 
 SGSelectionTool::SGSelectionTool(SGViewInspector *inspector) :
     AbstractTool(inspector),
@@ -132,4 +133,5 @@ SGViewInspector *SGSelectionTool::inspector() const
     return static_cast<SGViewInspector*>(AbstractTool::inspector());
 }
 
+} // namespace QtQuick2
 } // namespace QmlJSDebugger
diff --git a/src/plugins/qmltooling/qmldbg_inspector/sgselectiontool.h b/src/plugins/qmltooling/qmldbg_qtquick2/sgselectiontool.h
index 587701733d..fe338bd85a 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/sgselectiontool.h
+++ b/src/plugins/qmltooling/qmldbg_qtquick2/sgselectiontool.h
@@ -51,6 +51,7 @@ QT_FORWARD_DECLARE_CLASS(QAction)
 QT_FORWARD_DECLARE_CLASS(QQuickItem)
 
 namespace QmlJSDebugger {
+namespace QtQuick2 {
 
 class SGViewInspector;
 class SGHoverHighlight;
@@ -86,6 +87,7 @@ private:
     SGHoverHighlight *m_hoverHighlight;
 };
 
+} // namespace QtQuick2
 } // namespace QmlJSDebugger
 
 #endif // SGSELECTIONTOOL_H
diff --git a/src/plugins/qmltooling/qmldbg_inspector/sgviewinspector.cpp b/src/plugins/qmltooling/qmldbg_qtquick2/sgviewinspector.cpp
index 7b573cab27..06eb6eac97 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/sgviewinspector.cpp
+++ b/src/plugins/qmltooling/qmldbg_qtquick2/sgviewinspector.cpp
@@ -53,6 +53,7 @@
 #include <cfloat>
 
 namespace QmlJSDebugger {
+namespace QtQuick2 {
 
 /*
  * Collects all the items at the given position, from top to bottom.
@@ -327,4 +328,5 @@ QString SGViewInspector::titleForItem(QQuickItem *item) const
     return constructedName;
 }
 
+} // namespace QtQuick2
 } // namespace QmlJSDebugger
diff --git a/src/plugins/qmltooling/qmldbg_inspector/sgviewinspector.h b/src/plugins/qmltooling/qmldbg_qtquick2/sgviewinspector.h
index 788d6a0924..fa404a538a 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/sgviewinspector.h
+++ b/src/plugins/qmltooling/qmldbg_qtquick2/sgviewinspector.h
@@ -53,6 +53,7 @@ class QQuickItem;
 QT_END_NAMESPACE
 
 namespace QmlJSDebugger {
+namespace QtQuick2 {
 
 class SGSelectionTool;
 class SGSelectionHighlight;
@@ -105,6 +106,7 @@ private:
     bool m_designMode;
 };
 
+} // namespace QtQuick2
 } // namespace QmlJSDebugger
 
 #endif // QSGVIEWINSPECTOR_H
diff --git a/src/plugins/qmltooling/qmltooling.pro b/src/plugins/qmltooling/qmltooling.pro
index 5b735cb716..d03ee07fc9 100644
--- a/src/plugins/qmltooling/qmltooling.pro
+++ b/src/plugins/qmltooling/qmltooling.pro
@@ -1,4 +1,5 @@
 TEMPLATE = subdirs
 
-SUBDIRS = qmldbg_tcp
-SUBDIRS += qmldbg_inspector
+SUBDIRS =  qmldbg_tcp
+SUBDIRS += qmldbg_qtquick2
+SUBDIRS += qmldbg_qtquick1
diff --git a/src/plugins/qmltooling/qmldbg_inspector/abstracttool.cpp b/src/plugins/qmltooling/shared/abstracttool.cpp
index 39ced2a9d0..39ced2a9d0 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/abstracttool.cpp
+++ b/src/plugins/qmltooling/shared/abstracttool.cpp
diff --git a/src/plugins/qmltooling/qmldbg_inspector/abstracttool.h b/src/plugins/qmltooling/shared/abstracttool.h
index 0a216bfa83..0a216bfa83 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/abstracttool.h
+++ b/src/plugins/qmltooling/shared/abstracttool.h
diff --git a/src/plugins/qmltooling/qmldbg_inspector/abstractviewinspector.cpp b/src/plugins/qmltooling/shared/abstractviewinspector.cpp
index 1cebbd4283..796c4dce67 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/abstractviewinspector.cpp
+++ b/src/plugins/qmltooling/shared/abstractviewinspector.cpp
@@ -61,11 +61,8 @@ AbstractViewInspector::AbstractViewInspector(QObject *parent) :
     m_designModeBehavior(false),
     m_animationPaused(false),
     m_slowDownFactor(1.0),
-    m_debugService(0)
+    m_debugService(QDeclarativeInspectorService::instance())
 {
-    m_debugService = QDeclarativeInspectorService::instance();
-    connect(m_debugService, SIGNAL(gotMessage(QByteArray)),
-            this, SLOT(handleMessage(QByteArray)));
 }
 
 void AbstractViewInspector::createQmlObject(const QString &qml, QObject *parent,
diff --git a/src/plugins/qmltooling/qmldbg_inspector/abstractviewinspector.h b/src/plugins/qmltooling/shared/abstractviewinspector.h
index ee6eea5aee..a51efb0b83 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/abstractviewinspector.h
+++ b/src/plugins/qmltooling/shared/abstractviewinspector.h
@@ -72,6 +72,8 @@ class AbstractViewInspector : public QObject
 public:
     explicit AbstractViewInspector(QObject *parent = 0);
 
+    void handleMessage(const QByteArray &message);
+
     void createQmlObject(const QString &qml, QObject *parent,
                          const QStringList &importList,
                          const QString &filename = QString());
@@ -128,7 +130,6 @@ protected:
     virtual bool wheelEvent(QWheelEvent *event);
 
 private slots:
-    void handleMessage(const QByteArray &message);
     void sendColorChanged(const QColor &color);
 
 private:
diff --git a/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeinspectorprotocol.h b/src/plugins/qmltooling/shared/qdeclarativeinspectorprotocol.h
index 082abeb9bd..082abeb9bd 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeinspectorprotocol.h
+++ b/src/plugins/qmltooling/shared/qdeclarativeinspectorprotocol.h
diff --git a/src/plugins/qmltooling/qmldbg_inspector/qmlinspectorconstants.h b/src/plugins/qmltooling/shared/qmlinspectorconstants.h
index 5335222865..5335222865 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/qmlinspectorconstants.h
+++ b/src/plugins/qmltooling/shared/qmlinspectorconstants.h