From 4558477b01da263fd2eac6756805cfba0f12fa83 Mon Sep 17 00:00:00 2001 From: Lasse Holmstedt Date: Fri, 6 Aug 2010 17:47:49 +0200 Subject: [PATCH] Moved qmljsdebugger to share & debugger lib support for qml app wizard Reviewed-by: Alessandro Portale --- .../editor/abstractformeditortool.cpp | 1 - .../qmljsdebugger/editor/abstractformeditortool.h | 0 .../editor/boundingrecthighlighter.cpp | 0 .../qmljsdebugger/editor/boundingrecthighlighter.h | 0 .../qmljsdebugger/editor/colorpickertool.cpp | 0 .../qmljsdebugger/editor/colorpickertool.h | 0 .../qtcreator}/qmljsdebugger/editor/editor.pri | 0 .../qtcreator}/qmljsdebugger/editor/editor.qrc | 0 .../editor/images/color-picker-24.png | Bin .../editor/images/color-picker-hicontrast.png | Bin .../qmljsdebugger/editor/images/color-picker.png | Bin .../qmljsdebugger/editor/images/designmode-24.png | Bin .../qmljsdebugger/editor/images/designmode.png | Bin .../qmljsdebugger/editor/images/from-qml-24.png | Bin .../qmljsdebugger/editor/images/from-qml.png | Bin .../qmljsdebugger/editor/images/pause-24.png | Bin .../qmljsdebugger/editor/images/pause.png | Bin .../qmljsdebugger/editor/images/play-24.png | Bin .../qmljsdebugger/editor/images/play.png | Bin .../qmljsdebugger/editor/images/reload.png | Bin .../qmljsdebugger/editor/images/resize_handle.png | Bin .../qmljsdebugger/editor/images/select-24.png | Bin .../editor/images/select-marquee-24.png | Bin .../qmljsdebugger/editor/images/select-marquee.png | Bin .../qmljsdebugger/editor/images/select.png | Bin .../qmljsdebugger/editor/images/to-qml-24.png | Bin .../qmljsdebugger/editor/images/to-qml.png | Bin .../qmljsdebugger/editor/images/zoom-24.png | Bin .../qmljsdebugger/editor/images/zoom.png | Bin .../qtcreator}/qmljsdebugger/editor/layeritem.cpp | 0 .../qtcreator}/qmljsdebugger/editor/layeritem.h | 0 .../qmljsdebugger/editor/movemanipulator.cpp | 0 .../qmljsdebugger/editor/movemanipulator.h | 0 .../qtcreator}/qmljsdebugger/editor/movetool.cpp | 0 .../qtcreator}/qmljsdebugger/editor/movetool.h | 0 .../qtcreator}/qmljsdebugger/editor/qmltoolbar.cpp | 0 .../qtcreator}/qmljsdebugger/editor/qmltoolbar.h | 0 .../qmljsdebugger/editor/resize_handle.png | Bin .../qmljsdebugger/editor/resizecontroller.cpp | 0 .../qmljsdebugger/editor/resizecontroller.h | 0 .../qmljsdebugger/editor/resizehandleitem.cpp | 0 .../qmljsdebugger/editor/resizehandleitem.h | 0 .../qmljsdebugger/editor/resizeindicator.cpp | 0 .../qmljsdebugger/editor/resizeindicator.h | 0 .../qmljsdebugger/editor/resizemanipulator.cpp | 0 .../qmljsdebugger/editor/resizemanipulator.h | 0 .../qtcreator}/qmljsdebugger/editor/resizetool.cpp | 0 .../qtcreator}/qmljsdebugger/editor/resizetool.h | 0 .../editor/rubberbandselectionmanipulator.cpp | 0 .../editor/rubberbandselectionmanipulator.h | 0 .../qmljsdebugger/editor/selectionindicator.cpp | 0 .../qmljsdebugger/editor/selectionindicator.h | 0 .../qmljsdebugger/editor/selectionrectangle.cpp | 0 .../qmljsdebugger/editor/selectionrectangle.h | 0 .../qmljsdebugger/editor/selectiontool.cpp | 2 -- .../qmljsdebugger/editor/selectiontool.h | 0 .../editor/singleselectionmanipulator.cpp | 0 .../editor/singleselectionmanipulator.h | 0 .../qmljsdebugger/editor/snappinglinecreator.cpp | 0 .../qmljsdebugger/editor/snappinglinecreator.h | 0 .../editor/subcomponenteditortool.cpp | 0 .../qmljsdebugger/editor/subcomponenteditortool.h | 0 .../editor/subcomponentmasklayeritem.cpp | 0 .../editor/subcomponentmasklayeritem.h | 0 .../qmljsdebugger/editor/toolbarcolorbox.cpp | 0 .../qmljsdebugger/editor/toolbarcolorbox.h | 0 .../qtcreator}/qmljsdebugger/editor/zoomtool.cpp | 0 .../qtcreator}/qmljsdebugger/editor/zoomtool.h | 0 .../qmljsdebugger/include/jsdebuggeragent.h | 0 .../include/qdeclarativedesigndebugserver.h | 0 .../qmljsdebugger/include/qdeclarativedesignview.h | 0 .../qmljsdebugger/include/qmljsdebugger_global.h | 0 .../qmljsdebugger/include/qmlviewerconstants.h | 0 .../qtcreator}/qmljsdebugger/jsdebuggeragent.cpp | 0 .../qdeclarativedesigndebugserver.cpp | 0 .../qmljsdebugger/qdeclarativedesignview.cpp | 0 .../qmljsdebugger/qdeclarativedesignview_p.h | 0 .../qtcreator}/qmljsdebugger/qmljsdebugger-lib.pri | 4 ++-- .../qtcreator}/qmljsdebugger/qmljsdebugger.pri | 0 .../qtcreator}/qmljsdebugger/qmljsdebugger.pro | 2 +- share/qtcreator/templates/qmlapp/app.pro | 13 +++++++++---- .../templates/qmlapp/cpp/qmlapplicationview.cpp | 8 ++++++-- .../templates/qmlapp/cpp/qmlapplicationview.h | 5 +++++ share/share.pro | 4 +++- src/libs/libs.pro | 1 - .../qmlprojectmanager/wizards/qmlstandaloneapp.cpp | 7 ++++++- 86 files changed, 32 insertions(+), 15 deletions(-) rename {src/libs => share/qtcreator}/qmljsdebugger/editor/abstractformeditortool.cpp (99%) rename {src/libs => share/qtcreator}/qmljsdebugger/editor/abstractformeditortool.h (100%) rename {src/libs => share/qtcreator}/qmljsdebugger/editor/boundingrecthighlighter.cpp (100%) rename {src/libs => share/qtcreator}/qmljsdebugger/editor/boundingrecthighlighter.h (100%) rename {src/libs => share/qtcreator}/qmljsdebugger/editor/colorpickertool.cpp (100%) rename {src/libs => share/qtcreator}/qmljsdebugger/editor/colorpickertool.h (100%) rename {src/libs => share/qtcreator}/qmljsdebugger/editor/editor.pri (100%) rename {src/libs => share/qtcreator}/qmljsdebugger/editor/editor.qrc (100%) rename {src/libs => share/qtcreator}/qmljsdebugger/editor/images/color-picker-24.png (100%) rename {src/libs => share/qtcreator}/qmljsdebugger/editor/images/color-picker-hicontrast.png (100%) rename {src/libs => share/qtcreator}/qmljsdebugger/editor/images/color-picker.png (100%) rename {src/libs => share/qtcreator}/qmljsdebugger/editor/images/designmode-24.png (100%) rename {src/libs => share/qtcreator}/qmljsdebugger/editor/images/designmode.png (100%) rename {src/libs => share/qtcreator}/qmljsdebugger/editor/images/from-qml-24.png (100%) rename {src/libs => share/qtcreator}/qmljsdebugger/editor/images/from-qml.png (100%) rename {src/libs => share/qtcreator}/qmljsdebugger/editor/images/pause-24.png (100%) rename {src/libs => share/qtcreator}/qmljsdebugger/editor/images/pause.png (100%) rename {src/libs => share/qtcreator}/qmljsdebugger/editor/images/play-24.png (100%) rename {src/libs => share/qtcreator}/qmljsdebugger/editor/images/play.png (100%) rename {src/libs => share/qtcreator}/qmljsdebugger/editor/images/reload.png (100%) rename {src/libs => share/qtcreator}/qmljsdebugger/editor/images/resize_handle.png (100%) rename {src/libs => share/qtcreator}/qmljsdebugger/editor/images/select-24.png (100%) rename {src/libs => share/qtcreator}/qmljsdebugger/editor/images/select-marquee-24.png (100%) rename {src/libs => share/qtcreator}/qmljsdebugger/editor/images/select-marquee.png (100%) rename {src/libs => share/qtcreator}/qmljsdebugger/editor/images/select.png (100%) rename {src/libs => share/qtcreator}/qmljsdebugger/editor/images/to-qml-24.png (100%) rename {src/libs => share/qtcreator}/qmljsdebugger/editor/images/to-qml.png (100%) rename {src/libs => share/qtcreator}/qmljsdebugger/editor/images/zoom-24.png (100%) rename {src/libs => share/qtcreator}/qmljsdebugger/editor/images/zoom.png (100%) rename {src/libs => share/qtcreator}/qmljsdebugger/editor/layeritem.cpp (100%) rename {src/libs => share/qtcreator}/qmljsdebugger/editor/layeritem.h (100%) rename {src/libs => share/qtcreator}/qmljsdebugger/editor/movemanipulator.cpp (100%) rename {src/libs => share/qtcreator}/qmljsdebugger/editor/movemanipulator.h (100%) rename {src/libs => share/qtcreator}/qmljsdebugger/editor/movetool.cpp (100%) rename {src/libs => share/qtcreator}/qmljsdebugger/editor/movetool.h (100%) rename {src/libs => share/qtcreator}/qmljsdebugger/editor/qmltoolbar.cpp (100%) rename {src/libs => share/qtcreator}/qmljsdebugger/editor/qmltoolbar.h (100%) rename {src/libs => share/qtcreator}/qmljsdebugger/editor/resize_handle.png (100%) rename {src/libs => share/qtcreator}/qmljsdebugger/editor/resizecontroller.cpp (100%) rename {src/libs => share/qtcreator}/qmljsdebugger/editor/resizecontroller.h (100%) rename {src/libs => share/qtcreator}/qmljsdebugger/editor/resizehandleitem.cpp (100%) rename {src/libs => share/qtcreator}/qmljsdebugger/editor/resizehandleitem.h (100%) rename {src/libs => share/qtcreator}/qmljsdebugger/editor/resizeindicator.cpp (100%) rename {src/libs => share/qtcreator}/qmljsdebugger/editor/resizeindicator.h (100%) rename {src/libs => share/qtcreator}/qmljsdebugger/editor/resizemanipulator.cpp (100%) rename {src/libs => share/qtcreator}/qmljsdebugger/editor/resizemanipulator.h (100%) rename {src/libs => share/qtcreator}/qmljsdebugger/editor/resizetool.cpp (100%) rename {src/libs => share/qtcreator}/qmljsdebugger/editor/resizetool.h (100%) rename {src/libs => share/qtcreator}/qmljsdebugger/editor/rubberbandselectionmanipulator.cpp (100%) rename {src/libs => share/qtcreator}/qmljsdebugger/editor/rubberbandselectionmanipulator.h (100%) rename {src/libs => share/qtcreator}/qmljsdebugger/editor/selectionindicator.cpp (100%) rename {src/libs => share/qtcreator}/qmljsdebugger/editor/selectionindicator.h (100%) rename {src/libs => share/qtcreator}/qmljsdebugger/editor/selectionrectangle.cpp (100%) rename {src/libs => share/qtcreator}/qmljsdebugger/editor/selectionrectangle.h (100%) rename {src/libs => share/qtcreator}/qmljsdebugger/editor/selectiontool.cpp (99%) rename {src/libs => share/qtcreator}/qmljsdebugger/editor/selectiontool.h (100%) rename {src/libs => share/qtcreator}/qmljsdebugger/editor/singleselectionmanipulator.cpp (100%) rename {src/libs => share/qtcreator}/qmljsdebugger/editor/singleselectionmanipulator.h (100%) rename {src/libs => share/qtcreator}/qmljsdebugger/editor/snappinglinecreator.cpp (100%) rename {src/libs => share/qtcreator}/qmljsdebugger/editor/snappinglinecreator.h (100%) rename {src/libs => share/qtcreator}/qmljsdebugger/editor/subcomponenteditortool.cpp (100%) rename {src/libs => share/qtcreator}/qmljsdebugger/editor/subcomponenteditortool.h (100%) rename {src/libs => share/qtcreator}/qmljsdebugger/editor/subcomponentmasklayeritem.cpp (100%) rename {src/libs => share/qtcreator}/qmljsdebugger/editor/subcomponentmasklayeritem.h (100%) rename {src/libs => share/qtcreator}/qmljsdebugger/editor/toolbarcolorbox.cpp (100%) rename {src/libs => share/qtcreator}/qmljsdebugger/editor/toolbarcolorbox.h (100%) rename {src/libs => share/qtcreator}/qmljsdebugger/editor/zoomtool.cpp (100%) rename {src/libs => share/qtcreator}/qmljsdebugger/editor/zoomtool.h (100%) rename {src/libs => share/qtcreator}/qmljsdebugger/include/jsdebuggeragent.h (100%) rename {src/libs => share/qtcreator}/qmljsdebugger/include/qdeclarativedesigndebugserver.h (100%) rename {src/libs => share/qtcreator}/qmljsdebugger/include/qdeclarativedesignview.h (100%) rename {src/libs => share/qtcreator}/qmljsdebugger/include/qmljsdebugger_global.h (100%) rename {src/libs => share/qtcreator}/qmljsdebugger/include/qmlviewerconstants.h (100%) rename {src/libs => share/qtcreator}/qmljsdebugger/jsdebuggeragent.cpp (100%) rename {src/libs => share/qtcreator}/qmljsdebugger/qdeclarativedesigndebugserver.cpp (100%) rename {src/libs => share/qtcreator}/qmljsdebugger/qdeclarativedesignview.cpp (100%) rename {src/libs => share/qtcreator}/qmljsdebugger/qdeclarativedesignview_p.h (100%) rename {src/libs => share/qtcreator}/qmljsdebugger/qmljsdebugger-lib.pri (87%) rename {src/libs => share/qtcreator}/qmljsdebugger/qmljsdebugger.pri (100%) rename {src/libs => share/qtcreator}/qmljsdebugger/qmljsdebugger.pro (72%) diff --git a/src/libs/qmljsdebugger/editor/abstractformeditortool.cpp b/share/qtcreator/qmljsdebugger/editor/abstractformeditortool.cpp similarity index 99% rename from src/libs/qmljsdebugger/editor/abstractformeditortool.cpp rename to 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 #include #include diff --git a/src/libs/qmljsdebugger/editor/abstractformeditortool.h b/share/qtcreator/qmljsdebugger/editor/abstractformeditortool.h similarity index 100% rename from src/libs/qmljsdebugger/editor/abstractformeditortool.h rename to share/qtcreator/qmljsdebugger/editor/abstractformeditortool.h diff --git a/src/libs/qmljsdebugger/editor/boundingrecthighlighter.cpp b/share/qtcreator/qmljsdebugger/editor/boundingrecthighlighter.cpp similarity index 100% rename from src/libs/qmljsdebugger/editor/boundingrecthighlighter.cpp rename to share/qtcreator/qmljsdebugger/editor/boundingrecthighlighter.cpp diff --git a/src/libs/qmljsdebugger/editor/boundingrecthighlighter.h b/share/qtcreator/qmljsdebugger/editor/boundingrecthighlighter.h similarity index 100% rename from src/libs/qmljsdebugger/editor/boundingrecthighlighter.h rename to share/qtcreator/qmljsdebugger/editor/boundingrecthighlighter.h diff --git a/src/libs/qmljsdebugger/editor/colorpickertool.cpp b/share/qtcreator/qmljsdebugger/editor/colorpickertool.cpp similarity index 100% rename from src/libs/qmljsdebugger/editor/colorpickertool.cpp rename to share/qtcreator/qmljsdebugger/editor/colorpickertool.cpp diff --git a/src/libs/qmljsdebugger/editor/colorpickertool.h b/share/qtcreator/qmljsdebugger/editor/colorpickertool.h similarity index 100% rename from src/libs/qmljsdebugger/editor/colorpickertool.h rename to share/qtcreator/qmljsdebugger/editor/colorpickertool.h diff --git a/src/libs/qmljsdebugger/editor/editor.pri b/share/qtcreator/qmljsdebugger/editor/editor.pri similarity index 100% rename from src/libs/qmljsdebugger/editor/editor.pri rename to share/qtcreator/qmljsdebugger/editor/editor.pri diff --git a/src/libs/qmljsdebugger/editor/editor.qrc b/share/qtcreator/qmljsdebugger/editor/editor.qrc similarity index 100% rename from src/libs/qmljsdebugger/editor/editor.qrc rename to 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 similarity index 100% rename from src/libs/qmljsdebugger/editor/images/color-picker-24.png rename to 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 similarity index 100% rename from src/libs/qmljsdebugger/editor/images/color-picker-hicontrast.png rename to 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 similarity index 100% rename from src/libs/qmljsdebugger/editor/images/color-picker.png rename to 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 similarity index 100% rename from src/libs/qmljsdebugger/editor/images/designmode-24.png rename to 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 similarity index 100% rename from src/libs/qmljsdebugger/editor/images/designmode.png rename to 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 similarity index 100% rename from src/libs/qmljsdebugger/editor/images/from-qml-24.png rename to 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 similarity index 100% rename from src/libs/qmljsdebugger/editor/images/from-qml.png rename to 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 similarity index 100% rename from src/libs/qmljsdebugger/editor/images/pause-24.png rename to 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 similarity index 100% rename from src/libs/qmljsdebugger/editor/images/pause.png rename to 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 similarity index 100% rename from src/libs/qmljsdebugger/editor/images/play-24.png rename to 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 similarity index 100% rename from src/libs/qmljsdebugger/editor/images/play.png rename to 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 similarity index 100% rename from src/libs/qmljsdebugger/editor/images/reload.png rename to 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 similarity index 100% rename from src/libs/qmljsdebugger/editor/images/resize_handle.png rename to 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 similarity index 100% rename from src/libs/qmljsdebugger/editor/images/select-24.png rename to 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 similarity index 100% rename from src/libs/qmljsdebugger/editor/images/select-marquee-24.png rename to 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 similarity index 100% rename from src/libs/qmljsdebugger/editor/images/select-marquee.png rename to 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 similarity index 100% rename from src/libs/qmljsdebugger/editor/images/select.png rename to 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 similarity index 100% rename from src/libs/qmljsdebugger/editor/images/to-qml-24.png rename to 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 similarity index 100% rename from src/libs/qmljsdebugger/editor/images/to-qml.png rename to 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 similarity index 100% rename from src/libs/qmljsdebugger/editor/images/zoom-24.png rename to 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 similarity index 100% rename from src/libs/qmljsdebugger/editor/images/zoom.png rename to share/qtcreator/qmljsdebugger/editor/images/zoom.png diff --git a/src/libs/qmljsdebugger/editor/layeritem.cpp b/share/qtcreator/qmljsdebugger/editor/layeritem.cpp similarity index 100% rename from src/libs/qmljsdebugger/editor/layeritem.cpp rename to share/qtcreator/qmljsdebugger/editor/layeritem.cpp diff --git a/src/libs/qmljsdebugger/editor/layeritem.h b/share/qtcreator/qmljsdebugger/editor/layeritem.h similarity index 100% rename from src/libs/qmljsdebugger/editor/layeritem.h rename to share/qtcreator/qmljsdebugger/editor/layeritem.h diff --git a/src/libs/qmljsdebugger/editor/movemanipulator.cpp b/share/qtcreator/qmljsdebugger/editor/movemanipulator.cpp similarity index 100% rename from src/libs/qmljsdebugger/editor/movemanipulator.cpp rename to share/qtcreator/qmljsdebugger/editor/movemanipulator.cpp diff --git a/src/libs/qmljsdebugger/editor/movemanipulator.h b/share/qtcreator/qmljsdebugger/editor/movemanipulator.h similarity index 100% rename from src/libs/qmljsdebugger/editor/movemanipulator.h rename to share/qtcreator/qmljsdebugger/editor/movemanipulator.h diff --git a/src/libs/qmljsdebugger/editor/movetool.cpp b/share/qtcreator/qmljsdebugger/editor/movetool.cpp similarity index 100% rename from src/libs/qmljsdebugger/editor/movetool.cpp rename to share/qtcreator/qmljsdebugger/editor/movetool.cpp diff --git a/src/libs/qmljsdebugger/editor/movetool.h b/share/qtcreator/qmljsdebugger/editor/movetool.h similarity index 100% rename from src/libs/qmljsdebugger/editor/movetool.h rename to share/qtcreator/qmljsdebugger/editor/movetool.h diff --git a/src/libs/qmljsdebugger/editor/qmltoolbar.cpp b/share/qtcreator/qmljsdebugger/editor/qmltoolbar.cpp similarity index 100% rename from src/libs/qmljsdebugger/editor/qmltoolbar.cpp rename to share/qtcreator/qmljsdebugger/editor/qmltoolbar.cpp diff --git a/src/libs/qmljsdebugger/editor/qmltoolbar.h b/share/qtcreator/qmljsdebugger/editor/qmltoolbar.h similarity index 100% rename from src/libs/qmljsdebugger/editor/qmltoolbar.h rename to share/qtcreator/qmljsdebugger/editor/qmltoolbar.h diff --git a/src/libs/qmljsdebugger/editor/resize_handle.png b/share/qtcreator/qmljsdebugger/editor/resize_handle.png similarity index 100% rename from src/libs/qmljsdebugger/editor/resize_handle.png rename to share/qtcreator/qmljsdebugger/editor/resize_handle.png diff --git a/src/libs/qmljsdebugger/editor/resizecontroller.cpp b/share/qtcreator/qmljsdebugger/editor/resizecontroller.cpp similarity index 100% rename from src/libs/qmljsdebugger/editor/resizecontroller.cpp rename to share/qtcreator/qmljsdebugger/editor/resizecontroller.cpp diff --git a/src/libs/qmljsdebugger/editor/resizecontroller.h b/share/qtcreator/qmljsdebugger/editor/resizecontroller.h similarity index 100% rename from src/libs/qmljsdebugger/editor/resizecontroller.h rename to share/qtcreator/qmljsdebugger/editor/resizecontroller.h diff --git a/src/libs/qmljsdebugger/editor/resizehandleitem.cpp b/share/qtcreator/qmljsdebugger/editor/resizehandleitem.cpp similarity index 100% rename from src/libs/qmljsdebugger/editor/resizehandleitem.cpp rename to share/qtcreator/qmljsdebugger/editor/resizehandleitem.cpp diff --git a/src/libs/qmljsdebugger/editor/resizehandleitem.h b/share/qtcreator/qmljsdebugger/editor/resizehandleitem.h similarity index 100% rename from src/libs/qmljsdebugger/editor/resizehandleitem.h rename to share/qtcreator/qmljsdebugger/editor/resizehandleitem.h diff --git a/src/libs/qmljsdebugger/editor/resizeindicator.cpp b/share/qtcreator/qmljsdebugger/editor/resizeindicator.cpp similarity index 100% rename from src/libs/qmljsdebugger/editor/resizeindicator.cpp rename to share/qtcreator/qmljsdebugger/editor/resizeindicator.cpp diff --git a/src/libs/qmljsdebugger/editor/resizeindicator.h b/share/qtcreator/qmljsdebugger/editor/resizeindicator.h similarity index 100% rename from src/libs/qmljsdebugger/editor/resizeindicator.h rename to share/qtcreator/qmljsdebugger/editor/resizeindicator.h diff --git a/src/libs/qmljsdebugger/editor/resizemanipulator.cpp b/share/qtcreator/qmljsdebugger/editor/resizemanipulator.cpp similarity index 100% rename from src/libs/qmljsdebugger/editor/resizemanipulator.cpp rename to share/qtcreator/qmljsdebugger/editor/resizemanipulator.cpp diff --git a/src/libs/qmljsdebugger/editor/resizemanipulator.h b/share/qtcreator/qmljsdebugger/editor/resizemanipulator.h similarity index 100% rename from src/libs/qmljsdebugger/editor/resizemanipulator.h rename to share/qtcreator/qmljsdebugger/editor/resizemanipulator.h diff --git a/src/libs/qmljsdebugger/editor/resizetool.cpp b/share/qtcreator/qmljsdebugger/editor/resizetool.cpp similarity index 100% rename from src/libs/qmljsdebugger/editor/resizetool.cpp rename to share/qtcreator/qmljsdebugger/editor/resizetool.cpp diff --git a/src/libs/qmljsdebugger/editor/resizetool.h b/share/qtcreator/qmljsdebugger/editor/resizetool.h similarity index 100% rename from src/libs/qmljsdebugger/editor/resizetool.h rename to share/qtcreator/qmljsdebugger/editor/resizetool.h diff --git a/src/libs/qmljsdebugger/editor/rubberbandselectionmanipulator.cpp b/share/qtcreator/qmljsdebugger/editor/rubberbandselectionmanipulator.cpp similarity index 100% rename from src/libs/qmljsdebugger/editor/rubberbandselectionmanipulator.cpp rename to share/qtcreator/qmljsdebugger/editor/rubberbandselectionmanipulator.cpp diff --git a/src/libs/qmljsdebugger/editor/rubberbandselectionmanipulator.h b/share/qtcreator/qmljsdebugger/editor/rubberbandselectionmanipulator.h similarity index 100% rename from src/libs/qmljsdebugger/editor/rubberbandselectionmanipulator.h rename to share/qtcreator/qmljsdebugger/editor/rubberbandselectionmanipulator.h diff --git a/src/libs/qmljsdebugger/editor/selectionindicator.cpp b/share/qtcreator/qmljsdebugger/editor/selectionindicator.cpp similarity index 100% rename from src/libs/qmljsdebugger/editor/selectionindicator.cpp rename to share/qtcreator/qmljsdebugger/editor/selectionindicator.cpp diff --git a/src/libs/qmljsdebugger/editor/selectionindicator.h b/share/qtcreator/qmljsdebugger/editor/selectionindicator.h similarity index 100% rename from src/libs/qmljsdebugger/editor/selectionindicator.h rename to share/qtcreator/qmljsdebugger/editor/selectionindicator.h diff --git a/src/libs/qmljsdebugger/editor/selectionrectangle.cpp b/share/qtcreator/qmljsdebugger/editor/selectionrectangle.cpp similarity index 100% rename from src/libs/qmljsdebugger/editor/selectionrectangle.cpp rename to share/qtcreator/qmljsdebugger/editor/selectionrectangle.cpp diff --git a/src/libs/qmljsdebugger/editor/selectionrectangle.h b/share/qtcreator/qmljsdebugger/editor/selectionrectangle.h similarity index 100% rename from src/libs/qmljsdebugger/editor/selectionrectangle.h rename to share/qtcreator/qmljsdebugger/editor/selectionrectangle.h diff --git a/src/libs/qmljsdebugger/editor/selectiontool.cpp b/share/qtcreator/qmljsdebugger/editor/selectiontool.cpp similarity index 99% rename from src/libs/qmljsdebugger/editor/selectiontool.cpp rename to 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 -#include #include #include diff --git a/src/libs/qmljsdebugger/editor/selectiontool.h b/share/qtcreator/qmljsdebugger/editor/selectiontool.h similarity index 100% rename from src/libs/qmljsdebugger/editor/selectiontool.h rename to share/qtcreator/qmljsdebugger/editor/selectiontool.h diff --git a/src/libs/qmljsdebugger/editor/singleselectionmanipulator.cpp b/share/qtcreator/qmljsdebugger/editor/singleselectionmanipulator.cpp similarity index 100% rename from src/libs/qmljsdebugger/editor/singleselectionmanipulator.cpp rename to share/qtcreator/qmljsdebugger/editor/singleselectionmanipulator.cpp diff --git a/src/libs/qmljsdebugger/editor/singleselectionmanipulator.h b/share/qtcreator/qmljsdebugger/editor/singleselectionmanipulator.h similarity index 100% rename from src/libs/qmljsdebugger/editor/singleselectionmanipulator.h rename to share/qtcreator/qmljsdebugger/editor/singleselectionmanipulator.h diff --git a/src/libs/qmljsdebugger/editor/snappinglinecreator.cpp b/share/qtcreator/qmljsdebugger/editor/snappinglinecreator.cpp similarity index 100% rename from src/libs/qmljsdebugger/editor/snappinglinecreator.cpp rename to share/qtcreator/qmljsdebugger/editor/snappinglinecreator.cpp diff --git a/src/libs/qmljsdebugger/editor/snappinglinecreator.h b/share/qtcreator/qmljsdebugger/editor/snappinglinecreator.h similarity index 100% rename from src/libs/qmljsdebugger/editor/snappinglinecreator.h rename to share/qtcreator/qmljsdebugger/editor/snappinglinecreator.h diff --git a/src/libs/qmljsdebugger/editor/subcomponenteditortool.cpp b/share/qtcreator/qmljsdebugger/editor/subcomponenteditortool.cpp similarity index 100% rename from src/libs/qmljsdebugger/editor/subcomponenteditortool.cpp rename to share/qtcreator/qmljsdebugger/editor/subcomponenteditortool.cpp diff --git a/src/libs/qmljsdebugger/editor/subcomponenteditortool.h b/share/qtcreator/qmljsdebugger/editor/subcomponenteditortool.h similarity index 100% rename from src/libs/qmljsdebugger/editor/subcomponenteditortool.h rename to share/qtcreator/qmljsdebugger/editor/subcomponenteditortool.h diff --git a/src/libs/qmljsdebugger/editor/subcomponentmasklayeritem.cpp b/share/qtcreator/qmljsdebugger/editor/subcomponentmasklayeritem.cpp similarity index 100% rename from src/libs/qmljsdebugger/editor/subcomponentmasklayeritem.cpp rename to share/qtcreator/qmljsdebugger/editor/subcomponentmasklayeritem.cpp diff --git a/src/libs/qmljsdebugger/editor/subcomponentmasklayeritem.h b/share/qtcreator/qmljsdebugger/editor/subcomponentmasklayeritem.h similarity index 100% rename from src/libs/qmljsdebugger/editor/subcomponentmasklayeritem.h rename to share/qtcreator/qmljsdebugger/editor/subcomponentmasklayeritem.h diff --git a/src/libs/qmljsdebugger/editor/toolbarcolorbox.cpp b/share/qtcreator/qmljsdebugger/editor/toolbarcolorbox.cpp similarity index 100% rename from src/libs/qmljsdebugger/editor/toolbarcolorbox.cpp rename to share/qtcreator/qmljsdebugger/editor/toolbarcolorbox.cpp diff --git a/src/libs/qmljsdebugger/editor/toolbarcolorbox.h b/share/qtcreator/qmljsdebugger/editor/toolbarcolorbox.h similarity index 100% rename from src/libs/qmljsdebugger/editor/toolbarcolorbox.h rename to share/qtcreator/qmljsdebugger/editor/toolbarcolorbox.h diff --git a/src/libs/qmljsdebugger/editor/zoomtool.cpp b/share/qtcreator/qmljsdebugger/editor/zoomtool.cpp similarity index 100% rename from src/libs/qmljsdebugger/editor/zoomtool.cpp rename to share/qtcreator/qmljsdebugger/editor/zoomtool.cpp diff --git a/src/libs/qmljsdebugger/editor/zoomtool.h b/share/qtcreator/qmljsdebugger/editor/zoomtool.h similarity index 100% rename from src/libs/qmljsdebugger/editor/zoomtool.h rename to share/qtcreator/qmljsdebugger/editor/zoomtool.h diff --git a/src/libs/qmljsdebugger/include/jsdebuggeragent.h b/share/qtcreator/qmljsdebugger/include/jsdebuggeragent.h similarity index 100% rename from src/libs/qmljsdebugger/include/jsdebuggeragent.h rename to share/qtcreator/qmljsdebugger/include/jsdebuggeragent.h diff --git a/src/libs/qmljsdebugger/include/qdeclarativedesigndebugserver.h b/share/qtcreator/qmljsdebugger/include/qdeclarativedesigndebugserver.h similarity index 100% rename from src/libs/qmljsdebugger/include/qdeclarativedesigndebugserver.h rename to share/qtcreator/qmljsdebugger/include/qdeclarativedesigndebugserver.h diff --git a/src/libs/qmljsdebugger/include/qdeclarativedesignview.h b/share/qtcreator/qmljsdebugger/include/qdeclarativedesignview.h similarity index 100% rename from src/libs/qmljsdebugger/include/qdeclarativedesignview.h rename to share/qtcreator/qmljsdebugger/include/qdeclarativedesignview.h diff --git a/src/libs/qmljsdebugger/include/qmljsdebugger_global.h b/share/qtcreator/qmljsdebugger/include/qmljsdebugger_global.h similarity index 100% rename from src/libs/qmljsdebugger/include/qmljsdebugger_global.h rename to share/qtcreator/qmljsdebugger/include/qmljsdebugger_global.h diff --git a/src/libs/qmljsdebugger/include/qmlviewerconstants.h b/share/qtcreator/qmljsdebugger/include/qmlviewerconstants.h similarity index 100% rename from src/libs/qmljsdebugger/include/qmlviewerconstants.h rename to share/qtcreator/qmljsdebugger/include/qmlviewerconstants.h diff --git a/src/libs/qmljsdebugger/jsdebuggeragent.cpp b/share/qtcreator/qmljsdebugger/jsdebuggeragent.cpp similarity index 100% rename from src/libs/qmljsdebugger/jsdebuggeragent.cpp rename to share/qtcreator/qmljsdebugger/jsdebuggeragent.cpp diff --git a/src/libs/qmljsdebugger/qdeclarativedesigndebugserver.cpp b/share/qtcreator/qmljsdebugger/qdeclarativedesigndebugserver.cpp similarity index 100% rename from src/libs/qmljsdebugger/qdeclarativedesigndebugserver.cpp rename to share/qtcreator/qmljsdebugger/qdeclarativedesigndebugserver.cpp diff --git a/src/libs/qmljsdebugger/qdeclarativedesignview.cpp b/share/qtcreator/qmljsdebugger/qdeclarativedesignview.cpp similarity index 100% rename from src/libs/qmljsdebugger/qdeclarativedesignview.cpp rename to share/qtcreator/qmljsdebugger/qdeclarativedesignview.cpp diff --git a/src/libs/qmljsdebugger/qdeclarativedesignview_p.h b/share/qtcreator/qmljsdebugger/qdeclarativedesignview_p.h similarity index 100% rename from src/libs/qmljsdebugger/qdeclarativedesignview_p.h rename to share/qtcreator/qmljsdebugger/qdeclarativedesignview_p.h diff --git a/src/libs/qmljsdebugger/qmljsdebugger-lib.pri b/share/qtcreator/qmljsdebugger/qmljsdebugger-lib.pri similarity index 87% rename from src/libs/qmljsdebugger/qmljsdebugger-lib.pri rename to 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 similarity index 100% rename from src/libs/qmljsdebugger/qmljsdebugger.pri rename to share/qtcreator/qmljsdebugger/qmljsdebugger.pri diff --git a/src/libs/qmljsdebugger/qmljsdebugger.pro b/share/qtcreator/qmljsdebugger/qmljsdebugger.pro similarity index 72% rename from src/libs/qmljsdebugger/qmljsdebugger.pro rename to 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 +#ifdef Q_QML_JS_INSPECTOR +#include +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; }