From 28adb0a1787ad610f2302312af3ee7cd8630a57d Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Mon, 22 Nov 2010 16:11:06 +0100 Subject: [PATCH] QmlJSDebugger: Remove editor.pri Incorporate into qmljsdebugger-lib.pri Task-number: QTCREATORBUG-2951 --- .../qtcreator/qml/qmljsdebugger/editor/editor.pri | 40 ---------------------- .../qml/qmljsdebugger/qdeclarativeviewobserver.cpp | 14 ++++---- .../qml/qmljsdebugger/qmljsdebugger-lib.pri | 35 +++++++++++++++++-- src/plugins/qt4projectmanager/qmlobservertool.cpp | 2 +- 4 files changed, 41 insertions(+), 50 deletions(-) delete mode 100644 share/qtcreator/qml/qmljsdebugger/editor/editor.pri diff --git a/share/qtcreator/qml/qmljsdebugger/editor/editor.pri b/share/qtcreator/qml/qmljsdebugger/editor/editor.pri deleted file mode 100644 index c54c839f6e..0000000000 --- a/share/qtcreator/qml/qmljsdebugger/editor/editor.pri +++ /dev/null @@ -1,40 +0,0 @@ -# This file is part of Qt Creator -# It enables debugging of Qt Quick applications - -INCLUDEPATH += $$PWD - -HEADERS += \ - $$PWD/abstractformeditortool.h \ - $$PWD/selectiontool.h \ - $$PWD/layeritem.h \ - $$PWD/singleselectionmanipulator.h \ - $$PWD/rubberbandselectionmanipulator.h \ - $$PWD/selectionrectangle.h \ - $$PWD/selectionindicator.h \ - $$PWD/boundingrecthighlighter.h \ - $$PWD/subcomponenteditortool.h \ - $$PWD/subcomponentmasklayeritem.h \ - $$PWD/zoomtool.h \ - $$PWD/colorpickertool.h \ - $$PWD/qmltoolbar.h \ - $$PWD/toolbarcolorbox.h - -SOURCES += \ - $$PWD/abstractformeditortool.cpp \ - $$PWD/selectiontool.cpp \ - $$PWD/layeritem.cpp \ - $$PWD/singleselectionmanipulator.cpp \ - $$PWD/rubberbandselectionmanipulator.cpp \ - $$PWD/selectionrectangle.cpp \ - $$PWD/selectionindicator.cpp \ - $$PWD/boundingrecthighlighter.cpp \ - $$PWD/subcomponenteditortool.cpp \ - $$PWD/subcomponentmasklayeritem.cpp \ - $$PWD/zoomtool.cpp \ - $$PWD/colorpickertool.cpp \ - $$PWD/qmltoolbar.cpp \ - $$PWD/toolbarcolorbox.cpp - -RESOURCES += $$PWD/editor.qrc - -DEFINES += QWEAKPOINTER_ENABLE_ARROW diff --git a/share/qtcreator/qml/qmljsdebugger/qdeclarativeviewobserver.cpp b/share/qtcreator/qml/qmljsdebugger/qdeclarativeviewobserver.cpp index c2178d0b96..9d9eace43d 100644 --- a/share/qtcreator/qml/qmljsdebugger/qdeclarativeviewobserver.cpp +++ b/share/qtcreator/qml/qmljsdebugger/qdeclarativeviewobserver.cpp @@ -30,13 +30,13 @@ #include "qdeclarativeviewobserver.h" #include "qdeclarativeviewobserver_p.h" #include "qdeclarativeobserverservice.h" -#include "selectiontool.h" -#include "zoomtool.h" -#include "colorpickertool.h" -#include "layeritem.h" -#include "boundingrecthighlighter.h" -#include "subcomponenteditortool.h" -#include "qmltoolbar.h" +#include "editor/selectiontool.h" +#include "editor/zoomtool.h" +#include "editor/colorpickertool.h" +#include "editor/layeritem.h" +#include "editor/boundingrecthighlighter.h" +#include "editor/subcomponenteditortool.h" +#include "editor/qmltoolbar.h" #include "qt_private/qdeclarativedebughelper_p.h" diff --git a/share/qtcreator/qml/qmljsdebugger/qmljsdebugger-lib.pri b/share/qtcreator/qml/qmljsdebugger/qmljsdebugger-lib.pri index 06b9b4e93e..271986afa4 100644 --- a/share/qtcreator/qml/qmljsdebugger/qmljsdebugger-lib.pri +++ b/share/qtcreator/qml/qmljsdebugger/qmljsdebugger-lib.pri @@ -22,17 +22,48 @@ SOURCES += \ } !contains(DEFINES, NO_QMLOBSERVER) { - include($$PWD/editor/editor.pri) HEADERS += \ include/qdeclarativeviewobserver.h \ include/qdeclarativeobserverservice.h \ include/qmlobserverconstants.h \ + editor/abstractformeditortool.h \ + editor/selectiontool.h \ + editor/layeritem.h \ + editor/singleselectionmanipulator.h \ + editor/rubberbandselectionmanipulator.h \ + editor/selectionrectangle.h \ + editor/selectionindicator.h \ + editor/boundingrecthighlighter.h \ + editor/subcomponenteditortool.h \ + editor/subcomponentmasklayeritem.h \ + editor/zoomtool.h \ + editor/colorpickertool.h \ + editor/qmltoolbar.h \ + editor/toolbarcolorbox.h \ qdeclarativeviewobserver_p.h SOURCES += \ qdeclarativeviewobserver.cpp \ - qdeclarativeobserverservice.cpp + qdeclarativeobserverservice.cpp \ + editor/abstractformeditortool.cpp \ + editor/selectiontool.cpp \ + editor/layeritem.cpp \ + editor/singleselectionmanipulator.cpp \ + editor/rubberbandselectionmanipulator.cpp \ + editor/selectionrectangle.cpp \ + editor/selectionindicator.cpp \ + editor/boundingrecthighlighter.cpp \ + editor/subcomponenteditortool.cpp \ + editor/subcomponentmasklayeritem.cpp \ + editor/zoomtool.cpp \ + editor/colorpickertool.cpp \ + editor/qmltoolbar.cpp \ + editor/toolbarcolorbox.cpp + + RESOURCES += editor/editor.qrc + + DEFINES += QWEAKPOINTER_ENABLE_ARROW } OTHER_FILES += qmljsdebugger.pri diff --git a/src/plugins/qt4projectmanager/qmlobservertool.cpp b/src/plugins/qt4projectmanager/qmlobservertool.cpp index 838a5f5452..efeaaa3ce5 100644 --- a/src/plugins/qt4projectmanager/qmlobservertool.cpp +++ b/src/plugins/qt4projectmanager/qmlobservertool.cpp @@ -157,7 +157,7 @@ QString QmlObserverTool::copy(const QString &qtInstallData, QString *errorMessag debuggerLibEditorFiles << QLatin1String("abstractformeditortool.cpp") << QLatin1String("abstractformeditortool.h") << QLatin1String("boundingrecthighlighter.cpp") << QLatin1String("boundingrecthighlighter.h") << QLatin1String("colorpickertool.cpp") << QLatin1String("colorpickertool.h") - << QLatin1String("editor.pri") << QLatin1String("editor.qrc") + << QLatin1String("editor.qrc") << QLatin1String("layeritem.cpp") << QLatin1String("layeritem.h") << QLatin1String("qmltoolbar.cpp") << QLatin1String("qmltoolbar.h") << QLatin1String("rubberbandselectionmanipulator.cpp") -- 2.11.0