QmlJSDebugger: Remove editor.pri

Incorporate into qmljsdebugger-lib.pri

Task-number: QTCREATORBUG-2951

share/qtcreator/qml/qmljsdebugger/editor/editor.pri

@@ -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

share/qtcreator/qml/qmljsdebugger/qdeclarativeviewobserver.cpp

@@ -30,13 +30,13 @@
 #include "qdeclarativeviewobserver.h"
 #include "qdeclarativeviewobserver_p.h"
 #include "qdeclarativeobserverservice.h"
-#include "selectiontool.h"
+#include "editor/selectiontool.h"
-#include "zoomtool.h"
+#include "editor/zoomtool.h"
-#include "colorpickertool.h"
+#include "editor/colorpickertool.h"
-#include "layeritem.h"
+#include "editor/layeritem.h"
-#include "boundingrecthighlighter.h"
+#include "editor/boundingrecthighlighter.h"
-#include "subcomponenteditortool.h"
+#include "editor/subcomponenteditortool.h"
-#include "qmltoolbar.h"
+#include "editor/qmltoolbar.h"
 
 #include "qt_private/qdeclarativedebughelper_p.h"
 

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

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")