Let's start from scratch with a new debugger for QmlJS.

src/plugins/plugins.pro

@@ -43,10 +43,10 @@ contains(QT_CONFIG, declarative) {
     include(../private_headers.pri)
     exists($${QT_PRIVATE_HEADERS}/QtDeclarative/private/qdeclarativecontext_p.h) {
         SUBDIRS += plugin_qmldesigner \
-                   plugin_qmlinspector
+                   plugin_qmljsinspector
     } else {
         warning()
-        warning("QmlDesigner and QmlInspector plugins have been disabled")
+        warning("QmlDesigner and QmlJSInspector plugins have been disabled")
         warning("The plugins depend on on private headers from QtDeclarative module.")
         warning("To enable them, pass 'QT_PRIVATE_HEADERS=$QTDIR/include' to qmake, where $QTDIR is the source directory of qt.")
         warning()
@@ -200,12 +200,10 @@ plugin_qmldesigner.depends = plugin_coreplugin
 plugin_qmldesigner.depends += plugin_texteditor
 plugin_qmldesigner.depends += plugin_qmljseditor
 
-plugin_qmlinspector.subdir = qmlinspector
-plugin_qmlinspector.depends += plugin_projectexplorer
-plugin_qmlinspector.depends += plugin_cppeditor
-plugin_qmlinspector.depends += plugin_qmlprojectmanager
-plugin_qmlinspector.depends += plugin_debugger
-plugin_qmlinspector.depends += plugin_cpptools
+plugin_qmljsinspector.subdir = qmljsinspector
+plugin_qmljsinspector.depends += plugin_projectexplorer
+plugin_qmljsinspector.depends += plugin_qmlprojectmanager
+plugin_qmljsinspector.depends += plugin_debugger
 
 plugin_mercurial.subdir = mercurial
 plugin_mercurial.depends = plugin_vcsbase

src/plugins/qmlinspector/QmlInspector.pluginspec → src/plugins/qmljsinspector/QmlJSInspector.pluginspec

-<plugin name="QmlInspector" version="2.1.80" compatVersion="2.1.80">
+<plugin name="QmlJSInspector" version="2.1.80" compatVersion="2.1.80">
     <vendor>Nokia Corporation</vendor>
     <copyright>(C) 2010 Nokia Corporation</copyright>
     <license>

src/plugins/qmljsinspector/qmljsdebuggerclient.cpp

+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** Commercial Usage
+**
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** GNU Lesser General Public License Usage
+**
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://qt.nokia.com/contact.
+**
+**************************************************************************/
+#include "qmljsdebuggerclient.h"
+
+using namespace QmlJSInspector::Internal;
+
+DebuggerClient::DebuggerClient(QDeclarativeDebugConnection *client, Debugger::Internal::QmlEngine *engine)
+    : QDeclarativeDebugClient(QLatin1String("Debugger"), client)
+    , connection(client), engine(engine)
+{
+    connect(engine, SIGNAL(sendMessage(QByteArray)), this, SLOT(slotSendMessage(QByteArray)));
+    setEnabled(true);
+}
+
+DebuggerClient::~DebuggerClient()
+{
+}
+
+void DebuggerClient::messageReceived(const QByteArray &data)
+{
+    engine->messageReceived(data);
+}
+
+void DebuggerClient::slotSendMessage(const QByteArray &message)
+{
+    QDeclarativeDebugClient::sendMessage(message);
+}

src/plugins/qmljsinspector/qmljsdebuggerclient.h

+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** Commercial Usage
+**
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** GNU Lesser General Public License Usage
+**
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://qt.nokia.com/contact.
+**
+**************************************************************************/
+#ifndef QMLJSDEBUGGERCLIENT_H
+#define QMLJSDEBUGGERCLIENT_H
+
+#include <debugger/qml/qmlengine.h>
+#include <debugger/stackframe.h>
+#include <debugger/stackhandler.h>
+#include <debugger/debuggerrunner.h>
+#include <private/qdeclarativedebugclient_p.h> // QML private API
+
+namespace QmlJSInspector {
+namespace Internal {
+
+class DebuggerClient : public QDeclarativeDebugClient
+{
+    Q_OBJECT
+
+public:
+    DebuggerClient(QDeclarativeDebugConnection *client, Debugger::Internal::QmlEngine *engine);
+    virtual ~DebuggerClient();
+
+public: // attributes
+    QDeclarativeDebugConnection *connection;
+    Debugger::Internal::QmlEngine *engine;
+
+private Q_SLOTS:
+    void slotSendMessage(const QByteArray &message);
+
+protected:
+    virtual void messageReceived(const QByteArray &data);
+};
+
+} // Internal
+} // QmlJSInspector
+
+#endif // QMLJSDEBUGGERCLIENT_H

src/plugins/qmlinspector/qmlinspector.pro → src/plugins/qmljsinspector/qmljsinspector.pro

 TEMPLATE = lib
-TARGET = QmlInspector
-
+TARGET = QmlJSInspector
 INCLUDEPATH += .
 DEPENDPATH += .
+QT += declarative
 
 include(../../private_headers.pri)
 
-DEFINES += QMLINSPECTOR_LIBRARY
+DEFINES += QMLJSINSPECTOR_LIBRARY
 
-HEADERS += qmlinspectorplugin.h \
-           qmlinspectorconstants.h \
-           qmlinspector_global.h \
-           inspectorcontext.h \
+HEADERS += \
+qmljsdebuggerclient.h \
+qmljsinspector_global.h \
+qmljsinspectorconstants.h \
+qmljsinspectorcontext.h \
+qmljsinspectorplugin.h
 
-SOURCES += qmlinspectorplugin.cpp \
-           inspectorcontext.cpp
+SOURCES += \
+qmljsdebuggerclient.cpp \
+qmljsinspectorcontext.cpp \
+qmljsinspectorplugin.cpp
 
-OTHER_FILES += QmlInspector.pluginspec
-RESOURCES += qmlinspector.qrc
+OTHER_FILES += QmlJSInspector.pluginspec
+RESOURCES += qmljsinspector.qrc
 
 include(../../qtcreatorplugin.pri)
 include(../../plugins/projectexplorer/projectexplorer.pri)

src/plugins/qmlinspector/qmlinspector_global.h → src/plugins/qmljsinspector/qmljsinspector_global.h

@@ -31,7 +31,7 @@
 
 #include <QtCore/QtGlobal>
 
-#if defined(QMLINSPECTOR_LIBRARY)
+#if defined(QMLJSINSPECTOR_LIBRARY)
 #  define QMLINSPECTOR_EXPORT Q_DECL_EXPORT
 #else
 #  define QMLINSPECTOR_EXPORT Q_DECL_IMPORT

src/plugins/qmlinspector/qmlinspectorconstants.h → src/plugins/qmljsinspector/qmljsinspectorconstants.h

@@ -26,10 +26,10 @@
 ** contact the sales department at http://qt.nokia.com/contact.
 **
 **************************************************************************/
-#ifndef QMLINSPECTORCONSTANTS_H
-#define QMLINSPECTORCONSTANTS_H
+#ifndef QMLJSINSPECTORCONSTANTS_H
+#define QMLJSINSPECTORCONSTANTS_H
 
-namespace QmlInspector {
+namespace QmlJSInspector {
     namespace Constants {
         const char * const RUN = "QmlInspector.Run";
         const char * const STOP = "QmlInspector.Stop";

src/plugins/qmlinspector/inspectorcontext.cpp → src/plugins/qmljsinspector/qmljsinspectorcontext.cpp

@@ -27,15 +27,15 @@
 **
 **************************************************************************/
 
-#include "inspectorcontext.h"
-#include "qmlinspectorconstants.h"
+#include "qmljsinspectorcontext.h"
+#include "qmljsinspectorconstants.h"
 
 #include <coreplugin/icore.h>
 #include <QtGui/QWidget>
 #include <QtCore/QDebug>
 
-using namespace QmlInspector::Internal;
-using namespace QmlInspector::Constants;
+using namespace QmlJSInspector::Internal;
+using namespace QmlJSInspector::Constants;
 
 InspectorContext::InspectorContext(QWidget *widget)
   : IContext(widget),

src/plugins/qmlinspector/inspectorcontext.h → src/plugins/qmljsinspector/qmljsinspectorcontext.h

@@ -27,8 +27,8 @@
 **
 **************************************************************************/
 
-#ifndef INSPECTORCONTEXT_H
-#define INSPECTORCONTEXT_H
+#ifndef QMLJSINSPECTORCONTEXT_H
+#define QMLJSINSPECTORCONTEXT_H
 
 #include <coreplugin/icontext.h>
 #include <QList>
@@ -37,7 +37,7 @@ QT_BEGIN_NAMESPACE
 class QWidget;
 QT_END_NAMESPACE
 
-namespace QmlInspector {
+namespace QmlJSInspector {
 namespace Internal {
 
 class ObjectPropertiesView;
@@ -72,4 +72,5 @@ private:
 } // Internal
 } // QmlInspector
 
-#endif // DESIGNMODECONTEXT_H
+#endif
+

src/plugins/qmlinspector/qmlinspectorplugin.cpp → src/plugins/qmljsinspector/qmljsinspectorplugin.cpp

@@ -27,8 +27,8 @@
 **
 **************************************************************************/
 
-#include "qmlinspectorconstants.h"
-#include "qmlinspectorplugin.h"
+#include "qmljsinspectorconstants.h"
+#include "qmljsinspectorplugin.h"
 
 #include <debugger/debuggeruiswitcher.h>
 #include <debugger/debuggerconstants.h>
@@ -59,8 +59,8 @@
 
 #include <QtCore/QDebug>
 
-using namespace QmlInspector::Internal;
-using namespace QmlInspector::Constants;
+using namespace QmlJSInspector::Internal;
+using namespace QmlJSInspector::Constants;
 
 namespace {
 QToolButton *createToolButton(QAction *action)

src/plugins/qmlinspector/qmlinspectorplugin.h → src/plugins/qmljsinspector/qmljsinspectorplugin.h

@@ -26,8 +26,8 @@
 ** contact the sales department at http://qt.nokia.com/contact.
 **
 **************************************************************************/
-#ifndef QMLINSPECTORPLUGIN_H
-#define QMLINSPECTORPLUGIN_H
+#ifndef QMLJSINSPECTORPLUGIN_H
+#define QMLJSINSPECTORPLUGIN_H
 
 #include <extensionsystem/iplugin.h>
 
@@ -45,7 +45,7 @@ namespace ProjectExplorer {
     class Project;
 }
 
-namespace QmlInspector {
+namespace QmlJSInspector {
 namespace Internal {
 
 class QmlInspectorPlugin : public ExtensionSystem::IPlugin
@@ -69,6 +69,6 @@ private slots:
 };
 
 } // end of namespace Internal
-} // end of namespace QmlInspector
+} // end of QmlJSInspector
 
 #endif // QMLINSPECTORPLUGIN_H

src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp

@@ -41,7 +41,7 @@
 
 #include <debugger/debuggerconstants.h>
 #include <debugger/debuggeruiswitcher.h>
-#include <qmlinspector/qmlinspectorconstants.h>
+#include <qmljsinspector/qmljsinspectorconstants.h>
 
 #include <QDir>
 #include <QLabel>
@@ -86,7 +86,7 @@ void QmlRunControl::start()
 
     // FIXME this line should be refactored out in order to remove the dependency between
     // debugger and qmlprojectmanager, because debugger also relies on cpptools.
-    Debugger::DebuggerUISwitcher::instance()->setActiveLanguage(QmlInspector::Constants::LANG_QML);
+    Debugger::DebuggerUISwitcher::instance()->setActiveLanguage(QmlJSInspector::Constants::LANG_QML);
 
     emit started();
     emit appendMessage(this, tr("Starting %1 %2").arg(QDir::toNativeSeparators(m_executable),