86 files changed, 32 insertions, 15 deletions

diff --git a/src/libs/qmljsdebugger/editor/abstractformeditortool.cpp b/share/qtcreator/qmljsdebugger/editor/abstractformeditortool.cpp
index d483056610f..7d621c1e978 100644
--- a/src/libs/qmljsdebugger/editor/abstractformeditortool.cpp
+++ b/share/qtcreator/qmljsdebugger/editor/abstractformeditortool.cpp
@@ -30,7 +30,6 @@
 #include "abstractformeditortool.h"
 #include "qdeclarativedesignview.h"
 
-#include <private/qdeclarativecontext_p.h>
 #include <QDeclarativeEngine>
 
 #include <QtDebug>
diff --git a/src/libs/qmljsdebugger/editor/abstractformeditortool.h b/share/qtcreator/qmljsdebugger/editor/abstractformeditortool.h
index 2f8f3420f8f..2f8f3420f8f 100644
--- a/src/libs/qmljsdebugger/editor/abstractformeditortool.h
+++ b/share/qtcreator/qmljsdebugger/editor/abstractformeditortool.h
diff --git a/src/libs/qmljsdebugger/editor/boundingrecthighlighter.cpp b/share/qtcreator/qmljsdebugger/editor/boundingrecthighlighter.cpp
index 43ebea001ba..43ebea001ba 100644
--- a/src/libs/qmljsdebugger/editor/boundingrecthighlighter.cpp
+++ b/share/qtcreator/qmljsdebugger/editor/boundingrecthighlighter.cpp
diff --git a/src/libs/qmljsdebugger/editor/boundingrecthighlighter.h b/share/qtcreator/qmljsdebugger/editor/boundingrecthighlighter.h
index 139b1ac7877..139b1ac7877 100644
--- a/src/libs/qmljsdebugger/editor/boundingrecthighlighter.h
+++ b/share/qtcreator/qmljsdebugger/editor/boundingrecthighlighter.h
diff --git a/src/libs/qmljsdebugger/editor/colorpickertool.cpp b/share/qtcreator/qmljsdebugger/editor/colorpickertool.cpp
index 5bc349cba90..5bc349cba90 100644
--- a/src/libs/qmljsdebugger/editor/colorpickertool.cpp
+++ b/share/qtcreator/qmljsdebugger/editor/colorpickertool.cpp
diff --git a/src/libs/qmljsdebugger/editor/colorpickertool.h b/share/qtcreator/qmljsdebugger/editor/colorpickertool.h
index f762179c410..f762179c410 100644
--- a/src/libs/qmljsdebugger/editor/colorpickertool.h
+++ b/share/qtcreator/qmljsdebugger/editor/colorpickertool.h
diff --git a/src/libs/qmljsdebugger/editor/editor.pri b/share/qtcreator/qmljsdebugger/editor/editor.pri
index 150ca7dd08e..150ca7dd08e 100644
--- a/src/libs/qmljsdebugger/editor/editor.pri
+++ b/share/qtcreator/qmljsdebugger/editor/editor.pri
diff --git a/src/libs/qmljsdebugger/editor/editor.qrc b/share/qtcreator/qmljsdebugger/editor/editor.qrc
index 09fc2f6fb01..09fc2f6fb01 100644
--- a/src/libs/qmljsdebugger/editor/editor.qrc
+++ b/share/qtcreator/qmljsdebugger/editor/editor.qrc
diff --git a/src/libs/qmljsdebugger/editor/images/color-picker-24.png b/share/qtcreator/qmljsdebugger/editor/images/color-picker-24.png
index cff47212a4f..cff47212a4f 100644
--- a/src/libs/qmljsdebugger/editor/images/color-picker-24.png
+++ b/share/qtcreator/qmljsdebugger/editor/images/color-picker-24.png
diff --git a/src/libs/qmljsdebugger/editor/images/color-picker-hicontrast.png b/share/qtcreator/qmljsdebugger/editor/images/color-picker-hicontrast.png
index b953d08a689..b953d08a689 100644
--- a/src/libs/qmljsdebugger/editor/images/color-picker-hicontrast.png
+++ b/share/qtcreator/qmljsdebugger/editor/images/color-picker-hicontrast.png
diff --git a/src/libs/qmljsdebugger/editor/images/color-picker.png b/share/qtcreator/qmljsdebugger/editor/images/color-picker.png
index 026c31b3e1d..026c31b3e1d 100644
--- a/src/libs/qmljsdebugger/editor/images/color-picker.png
+++ b/share/qtcreator/qmljsdebugger/editor/images/color-picker.png
diff --git a/src/libs/qmljsdebugger/editor/images/designmode-24.png b/share/qtcreator/qmljsdebugger/editor/images/designmode-24.png
index b4e0ff43ff7..b4e0ff43ff7 100644
--- a/src/libs/qmljsdebugger/editor/images/designmode-24.png
+++ b/share/qtcreator/qmljsdebugger/editor/images/designmode-24.png
diff --git a/src/libs/qmljsdebugger/editor/images/designmode.png b/share/qtcreator/qmljsdebugger/editor/images/designmode.png
index b6a95e77bc2..b6a95e77bc2 100644
--- a/src/libs/qmljsdebugger/editor/images/designmode.png
+++ b/share/qtcreator/qmljsdebugger/editor/images/designmode.png
diff --git a/src/libs/qmljsdebugger/editor/images/from-qml-24.png b/share/qtcreator/qmljsdebugger/editor/images/from-qml-24.png
index 0ad21f3dbbf..0ad21f3dbbf 100644
--- a/src/libs/qmljsdebugger/editor/images/from-qml-24.png
+++ b/share/qtcreator/qmljsdebugger/editor/images/from-qml-24.png
diff --git a/src/libs/qmljsdebugger/editor/images/from-qml.png b/share/qtcreator/qmljsdebugger/editor/images/from-qml.png
index 666382c06dd..666382c06dd 100644
--- a/src/libs/qmljsdebugger/editor/images/from-qml.png
+++ b/share/qtcreator/qmljsdebugger/editor/images/from-qml.png
diff --git a/src/libs/qmljsdebugger/editor/images/pause-24.png b/share/qtcreator/qmljsdebugger/editor/images/pause-24.png
index d9a2f6f814b..d9a2f6f814b 100644
--- a/src/libs/qmljsdebugger/editor/images/pause-24.png
+++ b/share/qtcreator/qmljsdebugger/editor/images/pause-24.png
diff --git a/src/libs/qmljsdebugger/editor/images/pause.png b/share/qtcreator/qmljsdebugger/editor/images/pause.png
index 114d89b12bd..114d89b12bd 100644
--- a/src/libs/qmljsdebugger/editor/images/pause.png
+++ b/share/qtcreator/qmljsdebugger/editor/images/pause.png
diff --git a/src/libs/qmljsdebugger/editor/images/play-24.png b/share/qtcreator/qmljsdebugger/editor/images/play-24.png
index e2b9fbcf512..e2b9fbcf512 100644
--- a/src/libs/qmljsdebugger/editor/images/play-24.png
+++ b/share/qtcreator/qmljsdebugger/editor/images/play-24.png
diff --git a/src/libs/qmljsdebugger/editor/images/play.png b/share/qtcreator/qmljsdebugger/editor/images/play.png
index 011598a746f..011598a746f 100644
--- a/src/libs/qmljsdebugger/editor/images/play.png
+++ b/share/qtcreator/qmljsdebugger/editor/images/play.png
diff --git a/src/libs/qmljsdebugger/editor/images/reload.png b/share/qtcreator/qmljsdebugger/editor/images/reload.png
index 7042bec9ae9..7042bec9ae9 100644
--- a/src/libs/qmljsdebugger/editor/images/reload.png
+++ b/share/qtcreator/qmljsdebugger/editor/images/reload.png
diff --git a/src/libs/qmljsdebugger/editor/images/resize_handle.png b/share/qtcreator/qmljsdebugger/editor/images/resize_handle.png
index 2934f25b743..2934f25b743 100644
--- a/src/libs/qmljsdebugger/editor/images/resize_handle.png
+++ b/share/qtcreator/qmljsdebugger/editor/images/resize_handle.png
diff --git a/src/libs/qmljsdebugger/editor/images/select-24.png b/share/qtcreator/qmljsdebugger/editor/images/select-24.png
index 5388a9d16ab..5388a9d16ab 100644
--- a/src/libs/qmljsdebugger/editor/images/select-24.png
+++ b/share/qtcreator/qmljsdebugger/editor/images/select-24.png
diff --git a/src/libs/qmljsdebugger/editor/images/select-marquee-24.png b/share/qtcreator/qmljsdebugger/editor/images/select-marquee-24.png
index 0111ddae458..0111ddae458 100644
--- a/src/libs/qmljsdebugger/editor/images/select-marquee-24.png
+++ b/share/qtcreator/qmljsdebugger/editor/images/select-marquee-24.png
diff --git a/src/libs/qmljsdebugger/editor/images/select-marquee.png b/share/qtcreator/qmljsdebugger/editor/images/select-marquee.png
index 92fe40d1adc..92fe40d1adc 100644
--- a/src/libs/qmljsdebugger/editor/images/select-marquee.png
+++ b/share/qtcreator/qmljsdebugger/editor/images/select-marquee.png
diff --git a/src/libs/qmljsdebugger/editor/images/select.png b/share/qtcreator/qmljsdebugger/editor/images/select.png
index 672285582b5..672285582b5 100644
--- a/src/libs/qmljsdebugger/editor/images/select.png
+++ b/share/qtcreator/qmljsdebugger/editor/images/select.png
diff --git a/src/libs/qmljsdebugger/editor/images/to-qml-24.png b/share/qtcreator/qmljsdebugger/editor/images/to-qml-24.png
index b72450ddd47..b72450ddd47 100644
--- a/src/libs/qmljsdebugger/editor/images/to-qml-24.png
+++ b/share/qtcreator/qmljsdebugger/editor/images/to-qml-24.png
diff --git a/src/libs/qmljsdebugger/editor/images/to-qml.png b/share/qtcreator/qmljsdebugger/editor/images/to-qml.png
index 2ab951fd082..2ab951fd082 100644
--- a/src/libs/qmljsdebugger/editor/images/to-qml.png
+++ b/share/qtcreator/qmljsdebugger/editor/images/to-qml.png
diff --git a/src/libs/qmljsdebugger/editor/images/zoom-24.png b/share/qtcreator/qmljsdebugger/editor/images/zoom-24.png
index 03462001ecb..03462001ecb 100644
--- a/src/libs/qmljsdebugger/editor/images/zoom-24.png
+++ b/share/qtcreator/qmljsdebugger/editor/images/zoom-24.png
diff --git a/src/libs/qmljsdebugger/editor/images/zoom.png b/share/qtcreator/qmljsdebugger/editor/images/zoom.png
index 17f0da6d64f..17f0da6d64f 100644
--- a/src/libs/qmljsdebugger/editor/images/zoom.png
+++ b/share/qtcreator/qmljsdebugger/editor/images/zoom.png
diff --git a/src/libs/qmljsdebugger/editor/layeritem.cpp b/share/qtcreator/qmljsdebugger/editor/layeritem.cpp
index 65261f45953..65261f45953 100644
--- a/src/libs/qmljsdebugger/editor/layeritem.cpp
+++ b/share/qtcreator/qmljsdebugger/editor/layeritem.cpp
diff --git a/src/libs/qmljsdebugger/editor/layeritem.h b/share/qtcreator/qmljsdebugger/editor/layeritem.h
index 5ce3c82e56f..5ce3c82e56f 100644
--- a/src/libs/qmljsdebugger/editor/layeritem.h
+++ b/share/qtcreator/qmljsdebugger/editor/layeritem.h
diff --git a/src/libs/qmljsdebugger/editor/movemanipulator.cpp b/share/qtcreator/qmljsdebugger/editor/movemanipulator.cpp
index a9182fad185..a9182fad185 100644
--- a/src/libs/qmljsdebugger/editor/movemanipulator.cpp
+++ b/share/qtcreator/qmljsdebugger/editor/movemanipulator.cpp
diff --git a/src/libs/qmljsdebugger/editor/movemanipulator.h b/share/qtcreator/qmljsdebugger/editor/movemanipulator.h
index f09a7436249..f09a7436249 100644
--- a/src/libs/qmljsdebugger/editor/movemanipulator.h
+++ b/share/qtcreator/qmljsdebugger/editor/movemanipulator.h
diff --git a/src/libs/qmljsdebugger/editor/movetool.cpp b/share/qtcreator/qmljsdebugger/editor/movetool.cpp
index 20377c10ddb..20377c10ddb 100644
--- a/src/libs/qmljsdebugger/editor/movetool.cpp
+++ b/share/qtcreator/qmljsdebugger/editor/movetool.cpp
diff --git a/src/libs/qmljsdebugger/editor/movetool.h b/share/qtcreator/qmljsdebugger/editor/movetool.h
index 7514cf68664..7514cf68664 100644
--- a/src/libs/qmljsdebugger/editor/movetool.h
+++ b/share/qtcreator/qmljsdebugger/editor/movetool.h
diff --git a/src/libs/qmljsdebugger/editor/qmltoolbar.cpp b/share/qtcreator/qmljsdebugger/editor/qmltoolbar.cpp
index 585996a80cb..585996a80cb 100644
--- a/src/libs/qmljsdebugger/editor/qmltoolbar.cpp
+++ b/share/qtcreator/qmljsdebugger/editor/qmltoolbar.cpp
diff --git a/src/libs/qmljsdebugger/editor/qmltoolbar.h b/share/qtcreator/qmljsdebugger/editor/qmltoolbar.h
index 640d72320fc..640d72320fc 100644
--- a/src/libs/qmljsdebugger/editor/qmltoolbar.h
+++ b/share/qtcreator/qmljsdebugger/editor/qmltoolbar.h
diff --git a/src/libs/qmljsdebugger/editor/resize_handle.png b/share/qtcreator/qmljsdebugger/editor/resize_handle.png
index 2934f25b743..2934f25b743 100644
--- a/src/libs/qmljsdebugger/editor/resize_handle.png
+++ b/share/qtcreator/qmljsdebugger/editor/resize_handle.png
diff --git a/src/libs/qmljsdebugger/editor/resizecontroller.cpp b/share/qtcreator/qmljsdebugger/editor/resizecontroller.cpp
index 27e5daf9176..27e5daf9176 100644
--- a/src/libs/qmljsdebugger/editor/resizecontroller.cpp
+++ b/share/qtcreator/qmljsdebugger/editor/resizecontroller.cpp
diff --git a/src/libs/qmljsdebugger/editor/resizecontroller.h b/share/qtcreator/qmljsdebugger/editor/resizecontroller.h
index 6b214195709..6b214195709 100644
--- a/src/libs/qmljsdebugger/editor/resizecontroller.h
+++ b/share/qtcreator/qmljsdebugger/editor/resizecontroller.h
diff --git a/src/libs/qmljsdebugger/editor/resizehandleitem.cpp b/share/qtcreator/qmljsdebugger/editor/resizehandleitem.cpp
index 88d50b4650c..88d50b4650c 100644
--- a/src/libs/qmljsdebugger/editor/resizehandleitem.cpp
+++ b/share/qtcreator/qmljsdebugger/editor/resizehandleitem.cpp
diff --git a/src/libs/qmljsdebugger/editor/resizehandleitem.h b/share/qtcreator/qmljsdebugger/editor/resizehandleitem.h
index d036590d210..d036590d210 100644
--- a/src/libs/qmljsdebugger/editor/resizehandleitem.h
+++ b/share/qtcreator/qmljsdebugger/editor/resizehandleitem.h
diff --git a/src/libs/qmljsdebugger/editor/resizeindicator.cpp b/share/qtcreator/qmljsdebugger/editor/resizeindicator.cpp
index 62a7eb29cff..62a7eb29cff 100644
--- a/src/libs/qmljsdebugger/editor/resizeindicator.cpp
+++ b/share/qtcreator/qmljsdebugger/editor/resizeindicator.cpp
diff --git a/src/libs/qmljsdebugger/editor/resizeindicator.h b/share/qtcreator/qmljsdebugger/editor/resizeindicator.h
index 360dba72b7b..360dba72b7b 100644
--- a/src/libs/qmljsdebugger/editor/resizeindicator.h
+++ b/share/qtcreator/qmljsdebugger/editor/resizeindicator.h
diff --git a/src/libs/qmljsdebugger/editor/resizemanipulator.cpp b/share/qtcreator/qmljsdebugger/editor/resizemanipulator.cpp
index 329404244d6..329404244d6 100644
--- a/src/libs/qmljsdebugger/editor/resizemanipulator.cpp
+++ b/share/qtcreator/qmljsdebugger/editor/resizemanipulator.cpp
diff --git a/src/libs/qmljsdebugger/editor/resizemanipulator.h b/share/qtcreator/qmljsdebugger/editor/resizemanipulator.h
index 87bd943be31..87bd943be31 100644
--- a/src/libs/qmljsdebugger/editor/resizemanipulator.h
+++ b/share/qtcreator/qmljsdebugger/editor/resizemanipulator.h
diff --git a/src/libs/qmljsdebugger/editor/resizetool.cpp b/share/qtcreator/qmljsdebugger/editor/resizetool.cpp
index d5845be6672..d5845be6672 100644
--- a/src/libs/qmljsdebugger/editor/resizetool.cpp
+++ b/share/qtcreator/qmljsdebugger/editor/resizetool.cpp
diff --git a/src/libs/qmljsdebugger/editor/resizetool.h b/share/qtcreator/qmljsdebugger/editor/resizetool.h
index 250441a4e5c..250441a4e5c 100644
--- a/src/libs/qmljsdebugger/editor/resizetool.h
+++ b/share/qtcreator/qmljsdebugger/editor/resizetool.h
diff --git a/src/libs/qmljsdebugger/editor/rubberbandselectionmanipulator.cpp b/share/qtcreator/qmljsdebugger/editor/rubberbandselectionmanipulator.cpp
index 8f24552890d..8f24552890d 100644
--- a/src/libs/qmljsdebugger/editor/rubberbandselectionmanipulator.cpp
+++ b/share/qtcreator/qmljsdebugger/editor/rubberbandselectionmanipulator.cpp
diff --git a/src/libs/qmljsdebugger/editor/rubberbandselectionmanipulator.h b/share/qtcreator/qmljsdebugger/editor/rubberbandselectionmanipulator.h
index 272d054b650..272d054b650 100644
--- a/src/libs/qmljsdebugger/editor/rubberbandselectionmanipulator.h
+++ b/share/qtcreator/qmljsdebugger/editor/rubberbandselectionmanipulator.h
diff --git a/src/libs/qmljsdebugger/editor/selectionindicator.cpp b/share/qtcreator/qmljsdebugger/editor/selectionindicator.cpp
index 8b303276b81..8b303276b81 100644
--- a/src/libs/qmljsdebugger/editor/selectionindicator.cpp
+++ b/share/qtcreator/qmljsdebugger/editor/selectionindicator.cpp
diff --git a/src/libs/qmljsdebugger/editor/selectionindicator.h b/share/qtcreator/qmljsdebugger/editor/selectionindicator.h
index 9880111c6bd..9880111c6bd 100644
--- a/src/libs/qmljsdebugger/editor/selectionindicator.h
+++ b/share/qtcreator/qmljsdebugger/editor/selectionindicator.h
diff --git a/src/libs/qmljsdebugger/editor/selectionrectangle.cpp b/share/qtcreator/qmljsdebugger/editor/selectionrectangle.cpp
index 832a2d4ba21..832a2d4ba21 100644
--- a/src/libs/qmljsdebugger/editor/selectionrectangle.cpp
+++ b/share/qtcreator/qmljsdebugger/editor/selectionrectangle.cpp
diff --git a/src/libs/qmljsdebugger/editor/selectionrectangle.h b/share/qtcreator/qmljsdebugger/editor/selectionrectangle.h
index 3301a95793b..3301a95793b 100644
--- a/src/libs/qmljsdebugger/editor/selectionrectangle.h
+++ b/share/qtcreator/qmljsdebugger/editor/selectionrectangle.h
diff --git a/src/libs/qmljsdebugger/editor/selectiontool.cpp b/share/qtcreator/qmljsdebugger/editor/selectiontool.cpp
index 004b926b5e6..e64301414ac 100644
--- a/src/libs/qmljsdebugger/editor/selectiontool.cpp
+++ b/share/qtcreator/qmljsdebugger/editor/selectiontool.cpp
@@ -33,8 +33,6 @@
 //#include "resizehandleitem.h"
 #include "qdeclarativedesignview_p.h"
 
-#include <private/qdeclarativeitem_p.h>
-#include <private/qdeclarativecontext_p.h>
 #include <QDeclarativeEngine>
 
 #include <QApplication>
diff --git a/src/libs/qmljsdebugger/editor/selectiontool.h b/share/qtcreator/qmljsdebugger/editor/selectiontool.h
index 9fa6e8825e2..9fa6e8825e2 100644
--- a/src/libs/qmljsdebugger/editor/selectiontool.h
+++ b/share/qtcreator/qmljsdebugger/editor/selectiontool.h
diff --git a/src/libs/qmljsdebugger/editor/singleselectionmanipulator.cpp b/share/qtcreator/qmljsdebugger/editor/singleselectionmanipulator.cpp
index 3c5fed7cca3..3c5fed7cca3 100644
--- a/src/libs/qmljsdebugger/editor/singleselectionmanipulator.cpp
+++ b/share/qtcreator/qmljsdebugger/editor/singleselectionmanipulator.cpp
diff --git a/src/libs/qmljsdebugger/editor/singleselectionmanipulator.h b/share/qtcreator/qmljsdebugger/editor/singleselectionmanipulator.h
index 04f339640fc..04f339640fc 100644
--- a/src/libs/qmljsdebugger/editor/singleselectionmanipulator.h
+++ b/share/qtcreator/qmljsdebugger/editor/singleselectionmanipulator.h
diff --git a/src/libs/qmljsdebugger/editor/snappinglinecreator.cpp b/share/qtcreator/qmljsdebugger/editor/snappinglinecreator.cpp
index 4a0e3498376..4a0e3498376 100644
--- a/src/libs/qmljsdebugger/editor/snappinglinecreator.cpp
+++ b/share/qtcreator/qmljsdebugger/editor/snappinglinecreator.cpp
diff --git a/src/libs/qmljsdebugger/editor/snappinglinecreator.h b/share/qtcreator/qmljsdebugger/editor/snappinglinecreator.h
index dd4f38eeeed..dd4f38eeeed 100644
--- a/src/libs/qmljsdebugger/editor/snappinglinecreator.h
+++ b/share/qtcreator/qmljsdebugger/editor/snappinglinecreator.h
diff --git a/src/libs/qmljsdebugger/editor/subcomponenteditortool.cpp b/share/qtcreator/qmljsdebugger/editor/subcomponenteditortool.cpp
index 2bd96c80efd..2bd96c80efd 100644
--- a/src/libs/qmljsdebugger/editor/subcomponenteditortool.cpp
+++ b/share/qtcreator/qmljsdebugger/editor/subcomponenteditortool.cpp
diff --git a/src/libs/qmljsdebugger/editor/subcomponenteditortool.h b/share/qtcreator/qmljsdebugger/editor/subcomponenteditortool.h
index d54b6a71dc0..d54b6a71dc0 100644
--- a/src/libs/qmljsdebugger/editor/subcomponenteditortool.h
+++ b/share/qtcreator/qmljsdebugger/editor/subcomponenteditortool.h
diff --git a/src/libs/qmljsdebugger/editor/subcomponentmasklayeritem.cpp b/share/qtcreator/qmljsdebugger/editor/subcomponentmasklayeritem.cpp
index ce1b4371319..ce1b4371319 100644
--- a/src/libs/qmljsdebugger/editor/subcomponentmasklayeritem.cpp
+++ b/share/qtcreator/qmljsdebugger/editor/subcomponentmasklayeritem.cpp
diff --git a/src/libs/qmljsdebugger/editor/subcomponentmasklayeritem.h b/share/qtcreator/qmljsdebugger/editor/subcomponentmasklayeritem.h
index 9a646364612..9a646364612 100644
--- a/src/libs/qmljsdebugger/editor/subcomponentmasklayeritem.h
+++ b/share/qtcreator/qmljsdebugger/editor/subcomponentmasklayeritem.h
diff --git a/src/libs/qmljsdebugger/editor/toolbarcolorbox.cpp b/share/qtcreator/qmljsdebugger/editor/toolbarcolorbox.cpp
index e72f7084268..e72f7084268 100644
--- a/src/libs/qmljsdebugger/editor/toolbarcolorbox.cpp
+++ b/share/qtcreator/qmljsdebugger/editor/toolbarcolorbox.cpp
diff --git a/src/libs/qmljsdebugger/editor/toolbarcolorbox.h b/share/qtcreator/qmljsdebugger/editor/toolbarcolorbox.h
index f3d3afea697..f3d3afea697 100644
--- a/src/libs/qmljsdebugger/editor/toolbarcolorbox.h
+++ b/share/qtcreator/qmljsdebugger/editor/toolbarcolorbox.h
diff --git a/src/libs/qmljsdebugger/editor/zoomtool.cpp b/share/qtcreator/qmljsdebugger/editor/zoomtool.cpp
index 05937eafc2c..05937eafc2c 100644
--- a/src/libs/qmljsdebugger/editor/zoomtool.cpp
+++ b/share/qtcreator/qmljsdebugger/editor/zoomtool.cpp
diff --git a/src/libs/qmljsdebugger/editor/zoomtool.h b/share/qtcreator/qmljsdebugger/editor/zoomtool.h
index f3774efa11c..f3774efa11c 100644
--- a/src/libs/qmljsdebugger/editor/zoomtool.h
+++ b/share/qtcreator/qmljsdebugger/editor/zoomtool.h
diff --git a/src/libs/qmljsdebugger/include/jsdebuggeragent.h b/share/qtcreator/qmljsdebugger/include/jsdebuggeragent.h
index d27fea95235..d27fea95235 100644
--- a/src/libs/qmljsdebugger/include/jsdebuggeragent.h
+++ b/share/qtcreator/qmljsdebugger/include/jsdebuggeragent.h
diff --git a/src/libs/qmljsdebugger/include/qdeclarativedesigndebugserver.h b/share/qtcreator/qmljsdebugger/include/qdeclarativedesigndebugserver.h
index 53a554949a6..53a554949a6 100644
--- a/src/libs/qmljsdebugger/include/qdeclarativedesigndebugserver.h
+++ b/share/qtcreator/qmljsdebugger/include/qdeclarativedesigndebugserver.h
diff --git a/src/libs/qmljsdebugger/include/qdeclarativedesignview.h b/share/qtcreator/qmljsdebugger/include/qdeclarativedesignview.h
index 7b8241e242b..7b8241e242b 100644
--- a/src/libs/qmljsdebugger/include/qdeclarativedesignview.h
+++ b/share/qtcreator/qmljsdebugger/include/qdeclarativedesignview.h
diff --git a/src/libs/qmljsdebugger/include/qmljsdebugger_global.h b/share/qtcreator/qmljsdebugger/include/qmljsdebugger_global.h
index 6aba5be4262..6aba5be4262 100644
--- a/src/libs/qmljsdebugger/include/qmljsdebugger_global.h
+++ b/share/qtcreator/qmljsdebugger/include/qmljsdebugger_global.h
diff --git a/src/libs/qmljsdebugger/include/qmlviewerconstants.h b/share/qtcreator/qmljsdebugger/include/qmlviewerconstants.h
index 4cf90e19eee..4cf90e19eee 100644
--- a/src/libs/qmljsdebugger/include/qmlviewerconstants.h
+++ b/share/qtcreator/qmljsdebugger/include/qmlviewerconstants.h
diff --git a/src/libs/qmljsdebugger/jsdebuggeragent.cpp b/share/qtcreator/qmljsdebugger/jsdebuggeragent.cpp
index b94b0a81292..b94b0a81292 100644
--- a/src/libs/qmljsdebugger/jsdebuggeragent.cpp
+++ b/share/qtcreator/qmljsdebugger/jsdebuggeragent.cpp
diff --git a/src/libs/qmljsdebugger/qdeclarativedesigndebugserver.cpp b/share/qtcreator/qmljsdebugger/qdeclarativedesigndebugserver.cpp
index 9bb3546ee87..9bb3546ee87 100644
--- a/src/libs/qmljsdebugger/qdeclarativedesigndebugserver.cpp
+++ b/share/qtcreator/qmljsdebugger/qdeclarativedesigndebugserver.cpp
diff --git a/src/libs/qmljsdebugger/qdeclarativedesignview.cpp b/share/qtcreator/qmljsdebugger/qdeclarativedesignview.cpp
index 5335ca38ed1..5335ca38ed1 100644
--- a/src/libs/qmljsdebugger/qdeclarativedesignview.cpp
+++ b/share/qtcreator/qmljsdebugger/qdeclarativedesignview.cpp
diff --git a/src/libs/qmljsdebugger/qdeclarativedesignview_p.h b/share/qtcreator/qmljsdebugger/qdeclarativedesignview_p.h
index 6791f236fdf..6791f236fdf 100644
--- a/src/libs/qmljsdebugger/qdeclarativedesignview_p.h
+++ b/share/qtcreator/qmljsdebugger/qdeclarativedesignview_p.h
diff --git a/src/libs/qmljsdebugger/qmljsdebugger-lib.pri b/share/qtcreator/qmljsdebugger/qmljsdebugger-lib.pri
index 1449acb0b0c..7421f0e9ec5 100644
--- a/src/libs/qmljsdebugger/qmljsdebugger-lib.pri
+++ b/share/qtcreator/qmljsdebugger/qmljsdebugger-lib.pri
@@ -9,8 +9,8 @@ contains(CONFIG, dll) {
 }
 
 ## Once is not enough
-include($$PWD/../../private_headers.pri)
-include($$PWD/../../private_headers.pri)
+include($$PWD/../../../src/private_headers.pri)
+include($$PWD/../../../src/private_headers.pri)
 
 include($$PWD/editor/editor.pri)
 
diff --git a/src/libs/qmljsdebugger/qmljsdebugger.pri b/share/qtcreator/qmljsdebugger/qmljsdebugger.pri
index 34483da17d9..34483da17d9 100644
--- a/src/libs/qmljsdebugger/qmljsdebugger.pri
+++ b/share/qtcreator/qmljsdebugger/qmljsdebugger.pri
diff --git a/src/libs/qmljsdebugger/qmljsdebugger.pro b/share/qtcreator/qmljsdebugger/qmljsdebugger.pro
index 3f5b3207c11..457644a2a53 100644
--- a/src/libs/qmljsdebugger/qmljsdebugger.pro
+++ b/share/qtcreator/qmljsdebugger/qmljsdebugger.pro
@@ -4,5 +4,5 @@ TARGET = QmlJSDebugger
 
 unix:QMAKE_CXXFLAGS_DEBUG += -O3
 
-include(../../qtcreatorlibrary.pri)
+include(../../../src/qtcreatorlibrary.pri)
 include(qmljsdebugger-lib.pri)
diff --git a/share/qtcreator/templates/qmlapp/app.pro b/share/qtcreator/templates/qmlapp/app.pro
index 5a7b728ff43..ac891471866 100644
--- a/share/qtcreator/templates/qmlapp/app.pro
+++ b/share/qtcreator/templates/qmlapp/app.pro
@@ -19,15 +19,20 @@ OTHER_FILES = qml/app/app.qml
 # TARGETUID3 #
 symbian:TARGET.UID3 = 0xE1111234
 
-
-
+# QMLJSINSPECTOR #
+#DEFINES += Q_QML_JS_INSPECTOR
+contains(DEFINES, Q_QML_JS_INSPECTOR) {
+# QMLJSINSPECTOR_LIB_PATH #
+INSPECTOR_LIBRARY_PATH = $$PWD/../../../../share/qtcreator/qmljsdebugger
+include($$INSPECTOR_LIBRARY_PATH/qmljsdebugger-lib.pri)
+}
 
 # Edit the code below on your own risk.
 
 QT += declarative
 
-SOURCES = cpp/main.cpp cpp/qmlapplicationview.cpp
-HEADERS = cpp/qmlapplicationview.h
+SOURCES += cpp/main.cpp cpp/qmlapplicationview.cpp
+HEADERS += cpp/qmlapplicationview.h
 INCLUDEPATH += cpp
 
 symbian {
diff --git a/share/qtcreator/templates/qmlapp/cpp/qmlapplicationview.cpp b/share/qtcreator/templates/qmlapp/cpp/qmlapplicationview.cpp
index 2d0f505acc3..30a7fcb455e 100644
--- a/share/qtcreator/templates/qmlapp/cpp/qmlapplicationview.cpp
+++ b/share/qtcreator/templates/qmlapp/cpp/qmlapplicationview.cpp
@@ -20,8 +20,12 @@ class QmlApplicationViewPrivate
     friend class QmlApplicationView;
 };
 
-QmlApplicationView::QmlApplicationView(const QString &mainQmlFile, QWidget *parent)
-    : QDeclarativeView(parent)
+QmlApplicationView::QmlApplicationView(const QString &mainQmlFile, QWidget *parent) :
+#ifdef Q_QML_JS_INSPECTOR
+    QmlViewer::QDeclarativeDesignView(parent)
+#else
+    QDeclarativeView(parent)
+#endif
     , m_d(new QmlApplicationViewPrivate)
 {
 #ifdef Q_OS_MAC
diff --git a/share/qtcreator/templates/qmlapp/cpp/qmlapplicationview.h b/share/qtcreator/templates/qmlapp/cpp/qmlapplicationview.h
index 0b8b998f975..ef608830f4b 100644
--- a/share/qtcreator/templates/qmlapp/cpp/qmlapplicationview.h
+++ b/share/qtcreator/templates/qmlapp/cpp/qmlapplicationview.h
@@ -3,7 +3,12 @@
 
 #include <QtDeclarative/QDeclarativeView>
 
+#ifdef Q_QML_JS_INSPECTOR
+#include <qdeclarativedesignview.h>
+class QmlApplicationView : public QmlViewer::QDeclarativeDesignView
+#else
 class QmlApplicationView : public QDeclarativeView
+#endif
 {
 public:
     enum Orientation {
diff --git a/share/share.pro b/share/share.pro
index bbf224f2042..ef05076c144 100644
--- a/share/share.pro
+++ b/share/share.pro
@@ -1,2 +1,4 @@
 TEMPLATE = subdirs
-SUBDIRS = qtcreator/static.pro qtcreator/translations
+SUBDIRS = qtcreator/static.pro \
+          qtcreator/translations \
+          qtcreator/qmljsdebugger
diff --git a/src/libs/libs.pro b/src/libs/libs.pro
index 633fa4e0607..9b2c75bd05a 100644
--- a/src/libs/libs.pro
+++ b/src/libs/libs.pro
@@ -10,6 +10,5 @@ SUBDIRS   = \
     utils/process_stub.pro \
     cplusplus \
     qmljs \
-    qmljsdebugger \
     symbianutils \
     3rdparty
diff --git a/src/plugins/qmlprojectmanager/wizards/qmlstandaloneapp.cpp b/src/plugins/qmlprojectmanager/wizards/qmlstandaloneapp.cpp
index 9b9392cb38e..2e3a7418df2 100644
--- a/src/plugins/qmlprojectmanager/wizards/qmlstandaloneapp.cpp
+++ b/src/plugins/qmlprojectmanager/wizards/qmlstandaloneapp.cpp
@@ -290,6 +290,11 @@ QByteArray QmlStandaloneApp::generateProFile(const QString *errorMessage) const
             uncommentNextLine = true;
         } else if (line.contains(QLatin1String("# NETWORKACCESS")) && !m_networkEnabled) {
             uncommentNextLine = true;
+        } else if (line.contains(QLatin1String("# Q_QML_JS_INSPECTOR"))) {
+            // ### disabled for now; figure out the private headers problem first.
+            //uncommentNextLine = true;
+        } else if (line.contains(QLatin1String("# QMLJSINSPECTOR_LIB_PATH"))) {
+            valueOnNextLine = Core::ICore::instance()->resourcePath() + QLatin1String("/qmljsdebugger");
         }
 
         // Remove all marker comments
@@ -299,7 +304,7 @@ QByteArray QmlStandaloneApp::generateProFile(const QString *errorMessage) const
 
         if (!valueOnNextLine.isEmpty()) {
             out << line.left(line.indexOf(QLatin1Char('=')) + 2)
-                    << QDir::fromNativeSeparators(valueOnNextLine) << endl;
+                << QDir::fromNativeSeparators(valueOnNextLine) << endl;
             valueOnNextLine.clear();
             continue;
         }