QmlObserver: Allow to compile it again in source

Make it possible (again) to compile qmlobserver in share/qtcreator.
However, build artifacts in there might result in a malfunctioning
qtc-qmlobserver!

Reviewed-by: Thorbjorn Lindeijer

share/qtcreator/qml/qmljsdebugger/qmljsdebugger-src.pri

+INCLUDEPATH += $$PWD/include
+DEPENDPATH += $$PWD $$PWD/include editor $$PWD/qt-private
+
+HEADERS += \
+    $$PWD/include/jsdebuggeragent.h \
+    $$PWD/include/qmljsdebugger_global.h
+
+SOURCES += \
+    $$PWD/jsdebuggeragent.cpp
+
+HEADERS += \
+    $$PWD/include/qdeclarativeviewobserver.h \
+    $$PWD/include/qdeclarativeobserverservice.h \
+    $$PWD/include/qmlobserverconstants.h \
+    $$PWD/editor/abstractliveedittool.h \
+    $$PWD/editor/liveselectiontool.h \
+    $$PWD/editor/livelayeritem.h \
+    $$PWD/editor/livesingleselectionmanipulator.h \
+    $$PWD/editor/liverubberbandselectionmanipulator.h \
+    $$PWD/editor/liveselectionrectangle.h \
+    $$PWD/editor/liveselectionindicator.h \
+    $$PWD/editor/boundingrecthighlighter.h \
+    $$PWD/editor/subcomponenteditortool.h \
+    $$PWD/editor/subcomponentmasklayeritem.h \
+    $$PWD/editor/zoomtool.h \
+    $$PWD/editor/colorpickertool.h \
+    $$PWD/editor/qmltoolbar.h \
+    $$PWD/editor/toolbarcolorbox.h \
+    $$PWD/qdeclarativeviewobserver_p.h
+
+SOURCES += \
+    $$PWD/qdeclarativeviewobserver.cpp \
+    $$PWD/qdeclarativeobserverservice.cpp \
+    $$PWD/editor/abstractliveedittool.cpp \
+    $$PWD/editor/liveselectiontool.cpp \
+    $$PWD/editor/livelayeritem.cpp \
+    $$PWD/editor/livesingleselectionmanipulator.cpp \
+    $$PWD/editor/liverubberbandselectionmanipulator.cpp \
+    $$PWD/editor/liveselectionrectangle.cpp \
+    $$PWD/editor/liveselectionindicator.cpp \
+    $$PWD/editor/boundingrecthighlighter.cpp \
+    $$PWD/editor/subcomponenteditortool.cpp \
+    $$PWD/editor/subcomponentmasklayeritem.cpp \
+    $$PWD/editor/zoomtool.cpp \
+    $$PWD/editor/colorpickertool.cpp \
+    $$PWD/editor/qmltoolbar.cpp \
+    $$PWD/editor/toolbarcolorbox.cpp
+
+RESOURCES += $$PWD/editor/editor.qrc
+
+OTHER_FILES += $$PWD/qmljsdebugger.pri

share/qtcreator/qml/qmljsdebugger/qmljsdebugger.pro

@@ -4,8 +4,6 @@
 TEMPLATE = lib
 CONFIG += staticlib
 QT += declarative script
-INCLUDEPATH += $$PWD/include
-DEPENDPATH += $$PWD $$PWD/include editor $$PWD/qt-private
 
 DEFINES += BUILD_QMLJSDEBUGGER_STATIC_LIB
 
@@ -17,52 +15,4 @@ CONFIG(debug, debug|release) {
    windows:TARGET=QmlJSDebuggerd
 }
 
-# JS Debugging
-HEADERS += \
-    include/jsdebuggeragent.h \
-    include/qmljsdebugger_global.h
-
-SOURCES += \
-    jsdebuggeragent.cpp
-
-HEADERS += \
-    include/qdeclarativeviewobserver.h \
-    include/qdeclarativeobserverservice.h \
-    include/qmlobserverconstants.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/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 \
-    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/subcomponenteditortool.cpp \
-    editor/subcomponentmasklayeritem.cpp \
-    editor/zoomtool.cpp \
-    editor/colorpickertool.cpp \
-    editor/qmltoolbar.cpp \
-    editor/toolbarcolorbox.cpp
-
-RESOURCES += editor/editor.qrc
-
-OTHER_FILES += qmljsdebugger.pri
+include(qmljsdebugger-src.pri)

share/qtcreator/qml/qmlobserver/qmlobserver.pro

@@ -6,13 +6,17 @@ include(qml.pri)
 
 SOURCES += main.cpp
 
-# INCLUDEPATH and library path has to be extended by qmake call
-
-DEBUGLIB=QmlJSDebugger
-CONFIG(debug, debug|release) {
-    windows:DEBUGLIB = QmlJSDebuggerd
+exists($$PWD/../qmljsdebugger/qmljsdebugger-src.pri) {
+    # directly compile in debugger files
+    include($$PWD/../qmljsdebugger/qmljsdebugger-src.pri)
+} else {
+    # INCLUDEPATH and library path has to be extended by qmake call
+    DEBUGLIB=QmlJSDebugger
+    CONFIG(debug, debug|release) {
+        windows:DEBUGLIB = QmlJSDebuggerd
+    }
+    LIBS+=-l$$DEBUGLIB
 }
-LIBS+=-l$$DEBUGLIB
 
 #INCLUDEPATH += ../../include/QtDeclarative
 #INCLUDEPATH += ../../src/declarative/util