Debugger: Move inspector parts dealing with QtQuick1 into separate directory

Change-Id: Ifd024e214406dfc58d4389ce4397efcb4626b860
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>

diff --git a/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeinspectorplugin.cpp b/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeinspectorplugin.cpp
index 51dfda6..f4eec50 100644 (file)
--- a/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeinspectorplugin.cpp
+++ b/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeinspectorplugin.cpp
@@ -41,7 +41,7 @@
 
 #include "qdeclarativeinspectorplugin.h"
 
-#include "qdeclarativeviewinspector_p.h"
+#include "qtquick1/qdeclarativeviewinspector_p.h"
 #include "sgviewinspector.h"
 
 #include <QtCore/qplugin.h>

diff --git a/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro b/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro
index 38358da..9971f22 100644 (file)
--- a/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro
+++ b/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro
@@ -11,18 +11,18 @@ QTDIR_build:REQUIRES += "contains(QT_CONFIG, declarative)"
 SOURCES += \
     abstractviewinspector.cpp \
     qdeclarativeinspectorplugin.cpp \
-    qdeclarativeviewinspector.cpp \
-    editor/abstractliveedittool.cpp \
-    editor/liveselectiontool.cpp \
-    editor/livelayeritem.cpp \
-    editor/livesingleselectionmanipulator.cpp \
-    editor/liverubberbandselectionmanipulator.cpp \
-    editor/liveselectionrectangle.cpp \
-    editor/liveselectionindicator.cpp \
-    editor/boundingrecthighlighter.cpp \
-    editor/subcomponentmasklayeritem.cpp \
-    editor/zoomtool.cpp \
-    editor/colorpickertool.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 \
@@ -32,20 +32,20 @@ HEADERS += \
     abstractviewinspector.h \
     qdeclarativeinspectorplugin.h \
     qdeclarativeinspectorprotocol.h \
-    qdeclarativeviewinspector.h \
-    qdeclarativeviewinspector_p.h \
     qmlinspectorconstants.h \
-    editor/abstractliveedittool.h \
-    editor/liveselectiontool.h \
-    editor/livelayeritem.h \
-    editor/livesingleselectionmanipulator.h \
-    editor/liverubberbandselectionmanipulator.h \
-    editor/liveselectionrectangle.h \
-    editor/liveselectionindicator.h \
-    editor/boundingrecthighlighter.h \
-    editor/subcomponentmasklayeritem.h \
-    editor/zoomtool.h \
-    editor/colorpickertool.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 \

diff --git a/src/plugins/qmltooling/qmldbg_inspector/editor/abstractliveedittool.cpp b/src/plugins/qmltooling/qmldbg_inspector/qtquick1/abstractliveedittool.cpp
similarity index 99%
rename from src/plugins/qmltooling/qmldbg_inspector/editor/abstractliveedittool.cpp
rename to src/plugins/qmltooling/qmldbg_inspector/qtquick1/abstractliveedittool.cpp
index dce147c..c248292 100644 (file)
--- a/src/plugins/qmltooling/qmldbg_inspector/editor/abstractliveedittool.cpp
+++ b/src/plugins/qmltooling/qmldbg_inspector/qtquick1/abstractliveedittool.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include "abstractliveedittool.h"
-#include "../qdeclarativeviewinspector_p.h"
+#include "qdeclarativeviewinspector_p.h"
 
 #include <QDeclarativeEngine>
 

diff --git a/src/plugins/qmltooling/qmldbg_inspector/editor/abstractliveedittool.h b/src/plugins/qmltooling/qmldbg_inspector/qtquick1/abstractliveedittool.h
similarity index 100%
rename from src/plugins/qmltooling/qmldbg_inspector/editor/abstractliveedittool.h
rename to src/plugins/qmltooling/qmldbg_inspector/qtquick1/abstractliveedittool.h

diff --git a/src/plugins/qmltooling/qmldbg_inspector/editor/boundingrecthighlighter.cpp b/src/plugins/qmltooling/qmldbg_inspector/qtquick1/boundingrecthighlighter.cpp
similarity index 99%
rename from src/plugins/qmltooling/qmldbg_inspector/editor/boundingrecthighlighter.cpp
rename to src/plugins/qmltooling/qmldbg_inspector/qtquick1/boundingrecthighlighter.cpp
index 98fbc7e..e097d3c 100644 (file)
--- a/src/plugins/qmltooling/qmldbg_inspector/editor/boundingrecthighlighter.cpp
+++ b/src/plugins/qmltooling/qmldbg_inspector/qtquick1/boundingrecthighlighter.cpp
@@ -41,7 +41,7 @@
 
 #include "boundingrecthighlighter.h"
 
-#include "../qdeclarativeviewinspector.h"
+#include "qdeclarativeviewinspector.h"
 #include "../qmlinspectorconstants.h"
 
 #include <QtWidgets/QGraphicsPolygonItem>

diff --git a/src/plugins/qmltooling/qmldbg_inspector/editor/boundingrecthighlighter.h b/src/plugins/qmltooling/qmldbg_inspector/qtquick1/boundingrecthighlighter.h
similarity index 100%
rename from src/plugins/qmltooling/qmldbg_inspector/editor/boundingrecthighlighter.h
rename to src/plugins/qmltooling/qmldbg_inspector/qtquick1/boundingrecthighlighter.h

diff --git a/src/plugins/qmltooling/qmldbg_inspector/editor/colorpickertool.cpp b/src/plugins/qmltooling/qmldbg_inspector/qtquick1/colorpickertool.cpp
similarity index 98%
rename from src/plugins/qmltooling/qmldbg_inspector/editor/colorpickertool.cpp
rename to src/plugins/qmltooling/qmldbg_inspector/qtquick1/colorpickertool.cpp
index 5058f5e..581c1f5 100644 (file)
--- a/src/plugins/qmltooling/qmldbg_inspector/editor/colorpickertool.cpp
+++ b/src/plugins/qmltooling/qmldbg_inspector/qtquick1/colorpickertool.cpp
@@ -41,7 +41,7 @@
 
 #include "colorpickertool.h"
 
-#include "../qdeclarativeviewinspector.h"
+#include "qdeclarativeviewinspector.h"
 
 #include <QtGui/QMouseEvent>
 #include <QtGui/QKeyEvent>

diff --git a/src/plugins/qmltooling/qmldbg_inspector/editor/colorpickertool.h b/src/plugins/qmltooling/qmldbg_inspector/qtquick1/colorpickertool.h
similarity index 100%
rename from src/plugins/qmltooling/qmldbg_inspector/editor/colorpickertool.h
rename to src/plugins/qmltooling/qmldbg_inspector/qtquick1/colorpickertool.h

diff --git a/src/plugins/qmltooling/qmldbg_inspector/editor/livelayeritem.cpp b/src/plugins/qmltooling/qmldbg_inspector/qtquick1/livelayeritem.cpp
similarity index 100%
rename from src/plugins/qmltooling/qmldbg_inspector/editor/livelayeritem.cpp
rename to src/plugins/qmltooling/qmldbg_inspector/qtquick1/livelayeritem.cpp

diff --git a/src/plugins/qmltooling/qmldbg_inspector/editor/livelayeritem.h b/src/plugins/qmltooling/qmldbg_inspector/qtquick1/livelayeritem.h
similarity index 100%
rename from src/plugins/qmltooling/qmldbg_inspector/editor/livelayeritem.h
rename to src/plugins/qmltooling/qmldbg_inspector/qtquick1/livelayeritem.h

diff --git a/src/plugins/qmltooling/qmldbg_inspector/editor/liverubberbandselectionmanipulator.cpp b/src/plugins/qmltooling/qmldbg_inspector/qtquick1/liverubberbandselectionmanipulator.cpp
similarity index 99%
rename from src/plugins/qmltooling/qmldbg_inspector/editor/liverubberbandselectionmanipulator.cpp
rename to src/plugins/qmltooling/qmldbg_inspector/qtquick1/liverubberbandselectionmanipulator.cpp
index eda81f0..4987237 100644 (file)
--- a/src/plugins/qmltooling/qmldbg_inspector/editor/liverubberbandselectionmanipulator.cpp
+++ b/src/plugins/qmltooling/qmldbg_inspector/qtquick1/liverubberbandselectionmanipulator.cpp
@@ -41,7 +41,7 @@
 
 #include "liverubberbandselectionmanipulator.h"
 
-#include "../qdeclarativeviewinspector_p.h"
+#include "qdeclarativeviewinspector_p.h"
 
 #include <QtWidgets/QGraphicsItem>
 

diff --git a/src/plugins/qmltooling/qmldbg_inspector/editor/liverubberbandselectionmanipulator.h b/src/plugins/qmltooling/qmldbg_inspector/qtquick1/liverubberbandselectionmanipulator.h
similarity index 100%
rename from src/plugins/qmltooling/qmldbg_inspector/editor/liverubberbandselectionmanipulator.h
rename to src/plugins/qmltooling/qmldbg_inspector/qtquick1/liverubberbandselectionmanipulator.h

diff --git a/src/plugins/qmltooling/qmldbg_inspector/editor/liveselectionindicator.cpp b/src/plugins/qmltooling/qmldbg_inspector/qtquick1/liveselectionindicator.cpp
similarity index 98%
rename from src/plugins/qmltooling/qmldbg_inspector/editor/liveselectionindicator.cpp
rename to src/plugins/qmltooling/qmldbg_inspector/qtquick1/liveselectionindicator.cpp
index 036eb97..744cbf5 100644 (file)
--- a/src/plugins/qmltooling/qmldbg_inspector/editor/liveselectionindicator.cpp
+++ b/src/plugins/qmltooling/qmldbg_inspector/qtquick1/liveselectionindicator.cpp
@@ -41,7 +41,7 @@
 
 #include "liveselectionindicator.h"
 
-#include "../qdeclarativeviewinspector_p.h"
+#include "qdeclarativeviewinspector_p.h"
 #include "../qmlinspectorconstants.h"
 
 #include <QtWidgets/QGraphicsRectItem>

diff --git a/src/plugins/qmltooling/qmldbg_inspector/editor/liveselectionindicator.h b/src/plugins/qmltooling/qmldbg_inspector/qtquick1/liveselectionindicator.h
similarity index 100%
rename from src/plugins/qmltooling/qmldbg_inspector/editor/liveselectionindicator.h
rename to src/plugins/qmltooling/qmldbg_inspector/qtquick1/liveselectionindicator.h

diff --git a/src/plugins/qmltooling/qmldbg_inspector/editor/liveselectionrectangle.cpp b/src/plugins/qmltooling/qmldbg_inspector/qtquick1/liveselectionrectangle.cpp
similarity index 100%
rename from src/plugins/qmltooling/qmldbg_inspector/editor/liveselectionrectangle.cpp
rename to src/plugins/qmltooling/qmldbg_inspector/qtquick1/liveselectionrectangle.cpp

diff --git a/src/plugins/qmltooling/qmldbg_inspector/editor/liveselectionrectangle.h b/src/plugins/qmltooling/qmldbg_inspector/qtquick1/liveselectionrectangle.h
similarity index 100%
rename from src/plugins/qmltooling/qmldbg_inspector/editor/liveselectionrectangle.h
rename to src/plugins/qmltooling/qmldbg_inspector/qtquick1/liveselectionrectangle.h

diff --git a/src/plugins/qmltooling/qmldbg_inspector/editor/liveselectiontool.cpp b/src/plugins/qmltooling/qmldbg_inspector/qtquick1/liveselectiontool.cpp
similarity index 99%
rename from src/plugins/qmltooling/qmldbg_inspector/editor/liveselectiontool.cpp
rename to src/plugins/qmltooling/qmldbg_inspector/qtquick1/liveselectiontool.cpp
index 884e192..dc51a1f 100644 (file)
--- a/src/plugins/qmltooling/qmldbg_inspector/editor/liveselectiontool.cpp
+++ b/src/plugins/qmltooling/qmldbg_inspector/qtquick1/liveselectiontool.cpp
@@ -42,7 +42,7 @@
 #include "liveselectiontool.h"
 #include "livelayeritem.h"
 
-#include "../qdeclarativeviewinspector_p.h"
+#include "qdeclarativeviewinspector_p.h"
 
 #include <QtWidgets/QApplication>
 #include <QtGui/QWheelEvent>

diff --git a/src/plugins/qmltooling/qmldbg_inspector/editor/liveselectiontool.h b/src/plugins/qmltooling/qmldbg_inspector/qtquick1/liveselectiontool.h
similarity index 100%
rename from src/plugins/qmltooling/qmldbg_inspector/editor/liveselectiontool.h
rename to src/plugins/qmltooling/qmldbg_inspector/qtquick1/liveselectiontool.h

diff --git a/src/plugins/qmltooling/qmldbg_inspector/editor/livesingleselectionmanipulator.cpp b/src/plugins/qmltooling/qmldbg_inspector/qtquick1/livesingleselectionmanipulator.cpp
similarity index 99%
rename from src/plugins/qmltooling/qmldbg_inspector/editor/livesingleselectionmanipulator.cpp
rename to src/plugins/qmltooling/qmldbg_inspector/qtquick1/livesingleselectionmanipulator.cpp
index 34c1469..9c78018 100644 (file)
--- a/src/plugins/qmltooling/qmldbg_inspector/editor/livesingleselectionmanipulator.cpp
+++ b/src/plugins/qmltooling/qmldbg_inspector/qtquick1/livesingleselectionmanipulator.cpp
@@ -41,7 +41,7 @@
 
 #include "livesingleselectionmanipulator.h"
 
-#include "../qdeclarativeviewinspector_p.h"
+#include "qdeclarativeviewinspector_p.h"
 
 #include <QtDebug>
 

diff --git a/src/plugins/qmltooling/qmldbg_inspector/editor/livesingleselectionmanipulator.h b/src/plugins/qmltooling/qmldbg_inspector/qtquick1/livesingleselectionmanipulator.h
similarity index 100%
rename from src/plugins/qmltooling/qmldbg_inspector/editor/livesingleselectionmanipulator.h
rename to src/plugins/qmltooling/qmldbg_inspector/qtquick1/livesingleselectionmanipulator.h

diff --git a/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector.cpp b/src/plugins/qmltooling/qmldbg_inspector/qtquick1/qdeclarativeviewinspector.cpp
similarity index 98%
rename from src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector.cpp
rename to src/plugins/qmltooling/qmldbg_inspector/qtquick1/qdeclarativeviewinspector.cpp
index 4b284b7..ca34f9e 100644 (file)
--- a/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector.cpp
+++ b/src/plugins/qmltooling/qmldbg_inspector/qtquick1/qdeclarativeviewinspector.cpp
@@ -42,11 +42,11 @@
 #include "qdeclarativeviewinspector.h"
 #include "qdeclarativeviewinspector_p.h"
 
-#include "editor/liveselectiontool.h"
-#include "editor/zoomtool.h"
-#include "editor/colorpickertool.h"
-#include "editor/livelayeritem.h"
-#include "editor/boundingrecthighlighter.h"
+#include "liveselectiontool.h"
+#include "zoomtool.h"
+#include "colorpickertool.h"
+#include "livelayeritem.h"
+#include "boundingrecthighlighter.h"
 
 #include <QtQuick1/QDeclarativeItem>
 #include <QtGui/QMouseEvent>

diff --git a/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector.h b/src/plugins/qmltooling/qmldbg_inspector/qtquick1/qdeclarativeviewinspector.h
similarity index 100%
rename from src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector.h
rename to src/plugins/qmltooling/qmldbg_inspector/qtquick1/qdeclarativeviewinspector.h

diff --git a/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector_p.h b/src/plugins/qmltooling/qmldbg_inspector/qtquick1/qdeclarativeviewinspector_p.h
similarity index 100%
rename from src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector_p.h
rename to src/plugins/qmltooling/qmldbg_inspector/qtquick1/qdeclarativeviewinspector_p.h

diff --git a/src/plugins/qmltooling/qmldbg_inspector/editor/subcomponentmasklayeritem.cpp b/src/plugins/qmltooling/qmldbg_inspector/qtquick1/subcomponentmasklayeritem.cpp
similarity index 99%
rename from src/plugins/qmltooling/qmldbg_inspector/editor/subcomponentmasklayeritem.cpp
rename to src/plugins/qmltooling/qmldbg_inspector/qtquick1/subcomponentmasklayeritem.cpp
index 5d99886..4e3aed2 100644 (file)
--- a/src/plugins/qmltooling/qmldbg_inspector/editor/subcomponentmasklayeritem.cpp
+++ b/src/plugins/qmltooling/qmldbg_inspector/qtquick1/subcomponentmasklayeritem.cpp
@@ -42,7 +42,7 @@
 #include "subcomponentmasklayeritem.h"
 
 #include "../qmlinspectorconstants.h"
-#include "../qdeclarativeviewinspector.h"
+#include "qdeclarativeviewinspector.h"
 
 #include <QtGui/QPolygonF>
 

diff --git a/src/plugins/qmltooling/qmldbg_inspector/editor/subcomponentmasklayeritem.h b/src/plugins/qmltooling/qmldbg_inspector/qtquick1/subcomponentmasklayeritem.h
similarity index 100%
rename from src/plugins/qmltooling/qmldbg_inspector/editor/subcomponentmasklayeritem.h
rename to src/plugins/qmltooling/qmldbg_inspector/qtquick1/subcomponentmasklayeritem.h

diff --git a/src/plugins/qmltooling/qmldbg_inspector/editor/zoomtool.cpp b/src/plugins/qmltooling/qmldbg_inspector/qtquick1/zoomtool.cpp
similarity index 99%
rename from src/plugins/qmltooling/qmldbg_inspector/editor/zoomtool.cpp
rename to src/plugins/qmltooling/qmldbg_inspector/qtquick1/zoomtool.cpp
index 1aad9c3..cf456ff 100644 (file)
--- a/src/plugins/qmltooling/qmldbg_inspector/editor/zoomtool.cpp
+++ b/src/plugins/qmltooling/qmldbg_inspector/qtquick1/zoomtool.cpp
@@ -41,7 +41,7 @@
 
 #include "zoomtool.h"
 
-#include "../qdeclarativeviewinspector_p.h"
+#include "qdeclarativeviewinspector_p.h"
 
 #include <QtGui/QMouseEvent>
 #include <QtGui/QWheelEvent>

diff --git a/src/plugins/qmltooling/qmldbg_inspector/editor/zoomtool.h b/src/plugins/qmltooling/qmldbg_inspector/qtquick1/zoomtool.h
similarity index 100%
rename from src/plugins/qmltooling/qmldbg_inspector/editor/zoomtool.h
rename to src/plugins/qmltooling/qmldbg_inspector/qtquick1/zoomtool.h