Moved qmljsdebugger to share & debugger lib support for qml app wizard

Reviewed-by: Alessandro Portale

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>

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>

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)
 

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)

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 {

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

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 {

share/share.pro

@@ -1,2 +1,4 @@
 TEMPLATE = subdirs
-SUBDIRS = qtcreator/static.pro qtcreator/translations
+SUBDIRS = qtcreator/static.pro \
+          qtcreator/translations \
+          qtcreator/qmljsdebugger

src/libs/libs.pro

@@ -10,6 +10,5 @@ SUBDIRS   = \
     utils/process_stub.pro \
     cplusplus \
     qmljs \
-    qmljsdebugger \
     symbianutils \
     3rdparty

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;
         }