QmlDebug: Rename library and (most) classes

Rename the QmlJSDebugClient lib to QmlDebug (shorter names, easier differentiation with the shared/qmljsdebug lib). Also rename - QDeclarativeDebug* classes to QmlDebug* - QDeclarativeOutputParser class to QmlOutputParser To clarify the features, - Debugger::QmlDebuggerClient is now Debugger::BaseQmlDebuggerClient - QmlEngineDebugClient is now BaseEngineDebugClient - QmlDebuggerClient is now QmlEngineDebugClient - QDeclarativeEngineDebugClient is now DeclarativeEngineDebugClient Change-Id: Ie15713730a614c8ab4b637fad0924f95b54e633f Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
author: Kai Koehne <kai.koehne@nokia.com> 2012-04-18 12:06:10 +0200
committer: Kai Koehne <kai.koehne@nokia.com> 2012-04-18 14:31:36 +0200
commit: 4d3395b990038483f49096d7a6bffbd611f9a064 (patch)
tree: 3210450a1e200a00ec206acc46c5d9b9cf0b296d
parent: 53702d5dcc75a3f96b9ac4eb849b737a7694495b (diff)
download: qt-creator-4d3395b990038483f49096d7a6bffbd611f9a064.tar.gz
67 files changed, 601 insertions, 606 deletions
diff --git a/qtcreator.qbp b/qtcreator.qbp
index 269b6a2642..196eaded36 100644
--- a/qtcreator.qbp
+++ b/qtcreator.qbp
@@ -20,7 +20,7 @@ Project {
         "src/libs/languageutils/languageutils.qbs",
         "src/libs/qmleditorwidgets/qmleditorwidgets.qbs",
         "src/libs/qmljs/qmljs.qbs",
-        "src/libs/qmljsdebugclient/qmljsdebugclient.qbs",
+        "src/libs/qmldebug/qmldebug.qbs",
         "src/libs/qtcomponents/styleitem/styleitem.qbs",
         "src/libs/symbianutils/symbianutils.qbs",
         "src/libs/utils/utils.qbs",
diff --git a/src/libs/libs.pro b/src/libs/libs.pro
index f7f3626ae7..374c06f937 100644
--- a/src/libs/libs.pro
+++ b/src/libs/libs.pro
@@ -12,7 +12,7 @@ SUBDIRS   = \
     symbianutils \
     cplusplus \
     qmljs \
-    qmljsdebugclient \
+    qmldebug \
     glsl \
     qmleditorwidgets \
     qtcomponents/styleitem \
diff --git a/src/libs/qmljsdebugclient/qmlenginedebugclient.cpp b/src/libs/qmldebug/baseenginedebugclient.cpp
index 0ed99fa3d5..ea6036fd02 100644
--- a/src/libs/qmljsdebugclient/qmlenginedebugclient.cpp
+++ b/src/libs/qmldebug/baseenginedebugclient.cpp
@@ -29,10 +29,10 @@
 **
 **************************************************************************/
 
-#include "qmlenginedebugclient.h"
-#include "qmljsdebugclientconstants.h"
+#include "baseenginedebugclient.h"
+#include "qmldebugconstants.h"
 
-namespace QmlJsDebugClient {
+namespace QmlDebug {
 
 struct QmlObjectData {
     QUrl url;
@@ -71,7 +71,7 @@ QDataStream &operator>>(QDataStream &ds, QmlObjectProperty &data)
     return ds;
 }
 
-void QmlEngineDebugClient::decode(QDataStream &ds,
+void BaseEngineDebugClient::decode(QDataStream &ds,
                                    QmlDebugObjectReference &o,
                                    bool simple)
 {
@@ -138,7 +138,7 @@ void QmlEngineDebugClient::decode(QDataStream &ds,
     }
 }
 
-void QmlEngineDebugClient::decode(QDataStream &ds,
+void BaseEngineDebugClient::decode(QDataStream &ds,
                                    QmlDebugContextReference &c)
 {
     ds >> c.m_name >> c.m_debugId;
@@ -162,12 +162,12 @@ void QmlEngineDebugClient::decode(QDataStream &ds,
     }
 }
 
-void QmlEngineDebugClient::statusChanged(Status status)
+void BaseEngineDebugClient::statusChanged(Status status)
 {
     emit newStatus(status);
 }
 
-void QmlEngineDebugClient::messageReceived(const QByteArray &data)
+void BaseEngineDebugClient::messageReceived(const QByteArray &data)
 {
     QDataStream ds(data);
     int queryId;
@@ -221,18 +221,18 @@ void QmlEngineDebugClient::messageReceived(const QByteArray &data)
     }
 }
 
-QmlEngineDebugClient::QmlEngineDebugClient(const QString &clientName,
-                     QDeclarativeDebugConnection *conn)
-    : QDeclarativeDebugClient(clientName, conn),
+BaseEngineDebugClient::BaseEngineDebugClient(const QString &clientName,
+                     QmlDebugConnection *conn)
+    : QmlDebugClient(clientName, conn),
       m_nextId(1)
 {
     setObjectName(clientName);
 }
 
-quint32 QmlEngineDebugClient::addWatch(const QmlDebugPropertyReference &property)
+quint32 BaseEngineDebugClient::addWatch(const QmlDebugPropertyReference &property)
 {
     quint32 id;
-    if (status() == QDeclarativeDebugClient::Enabled) {
+    if (status() == QmlDebugClient::Enabled) {
         id = getId();
         QByteArray message;
         QDataStream ds(&message, QIODevice::WriteOnly);
@@ -243,18 +243,18 @@ quint32 QmlEngineDebugClient::addWatch(const QmlDebugPropertyReference &property
     return id;
 }
 
-quint32 QmlEngineDebugClient::addWatch(const QmlDebugContextReference &/*context*/,
+quint32 BaseEngineDebugClient::addWatch(const QmlDebugContextReference &/*context*/,
                                        const QString &/*id*/)
 {
     qWarning("QmlEngineDebugClient::addWatch(): Not implemented");
     return 0;
 }
 
-quint32 QmlEngineDebugClient::addWatch(const QmlDebugObjectReference &object,
+quint32 BaseEngineDebugClient::addWatch(const QmlDebugObjectReference &object,
                                        const QString &expr)
 {
     quint32 id = 0;
-    if (status() == QDeclarativeDebugClient::Enabled) {
+    if (status() == QmlDebugClient::Enabled) {
         id = getId();
         QByteArray message;
         QDataStream ds(&message, QIODevice::WriteOnly);
@@ -264,10 +264,10 @@ quint32 QmlEngineDebugClient::addWatch(const QmlDebugObjectReference &object,
     return id;
 }
 
-quint32 QmlEngineDebugClient::addWatch(const QmlDebugObjectReference &object)
+quint32 BaseEngineDebugClient::addWatch(const QmlDebugObjectReference &object)
 {
     quint32 id = 0;
-    if (status() == QDeclarativeDebugClient::Enabled) {
+    if (status() == QmlDebugClient::Enabled) {
         id = getId();
         QByteArray message;
         QDataStream ds(&message, QIODevice::WriteOnly);
@@ -277,15 +277,15 @@ quint32 QmlEngineDebugClient::addWatch(const QmlDebugObjectReference &object)
     return id;
 }
 
-quint32 QmlEngineDebugClient::addWatch(const QmlDebugFileReference &/*file*/)
+quint32 BaseEngineDebugClient::addWatch(const QmlDebugFileReference &/*file*/)
 {
     qWarning("QmlEngineDebugClient::addWatch(): Not implemented");
     return 0;
 }
 
-void QmlEngineDebugClient::removeWatch(quint32 id)
+void BaseEngineDebugClient::removeWatch(quint32 id)
 {
-    if (status() == QDeclarativeDebugClient::Enabled) {
+    if (status() == QmlDebugClient::Enabled) {
         QByteArray message;
         QDataStream ds(&message, QIODevice::WriteOnly);
         ds << QByteArray("NO_WATCH") << id;
@@ -293,10 +293,10 @@ void QmlEngineDebugClient::removeWatch(quint32 id)
     }
 }
 
-quint32 QmlEngineDebugClient::queryAvailableEngines()
+quint32 BaseEngineDebugClient::queryAvailableEngines()
 {
     quint32 id = 0;
-    if (status() == QDeclarativeDebugClient::Enabled) {
+    if (status() == QmlDebugClient::Enabled) {
         id = getId();
         QByteArray message;
         QDataStream ds(&message, QIODevice::WriteOnly);
@@ -306,10 +306,10 @@ quint32 QmlEngineDebugClient::queryAvailableEngines()
     return id;
 }
 
-quint32 QmlEngineDebugClient::queryRootContexts(const QmlDebugEngineReference &engine)
+quint32 BaseEngineDebugClient::queryRootContexts(const QmlDebugEngineReference &engine)
 {
     quint32 id = 0;
-    if (status() == QDeclarativeDebugClient::Enabled && engine.m_debugId != -1) {
+    if (status() == QmlDebugClient::Enabled && engine.m_debugId != -1) {
         id = getId();
         QByteArray message;
         QDataStream ds(&message, QIODevice::WriteOnly);
@@ -319,10 +319,10 @@ quint32 QmlEngineDebugClient::queryRootContexts(const QmlDebugEngineReference &e
     return id;
 }
 
-quint32 QmlEngineDebugClient::queryObject(const QmlDebugObjectReference &object)
+quint32 BaseEngineDebugClient::queryObject(const QmlDebugObjectReference &object)
 {
     quint32 id = 0;
-    if (status() == QDeclarativeDebugClient::Enabled && object.m_debugId != -1) {
+    if (status() == QmlDebugClient::Enabled && object.m_debugId != -1) {
         id = getId();
         QByteArray message;
         QDataStream ds(&message, QIODevice::WriteOnly);
@@ -333,10 +333,10 @@ quint32 QmlEngineDebugClient::queryObject(const QmlDebugObjectReference &object)
     return id;
 }
 
-quint32 QmlEngineDebugClient::queryObjectRecursive(const QmlDebugObjectReference &object)
+quint32 BaseEngineDebugClient::queryObjectRecursive(const QmlDebugObjectReference &object)
 {
     quint32 id = 0;
-    if (status() == QDeclarativeDebugClient::Enabled && object.m_debugId != -1) {
+    if (status() == QmlDebugClient::Enabled && object.m_debugId != -1) {
         id = getId();
         QByteArray message;
         QDataStream ds(&message, QIODevice::WriteOnly);
@@ -347,11 +347,11 @@ quint32 QmlEngineDebugClient::queryObjectRecursive(const QmlDebugObjectReference
     return id;
 }
 
-quint32 QmlEngineDebugClient::queryExpressionResult(int objectDebugId,
+quint32 BaseEngineDebugClient::queryExpressionResult(int objectDebugId,
                                                     const QString &expr)
 {
     quint32 id = 0;
-    if (status() == QDeclarativeDebugClient::Enabled && objectDebugId != -1) {
+    if (status() == QmlDebugClient::Enabled && objectDebugId != -1) {
         id = getId();
         QByteArray message;
         QDataStream ds(&message, QIODevice::WriteOnly);
@@ -361,7 +361,7 @@ quint32 QmlEngineDebugClient::queryExpressionResult(int objectDebugId,
     return id;
 }
 
-quint32 QmlEngineDebugClient::setBindingForObject(
+quint32 BaseEngineDebugClient::setBindingForObject(
         int objectDebugId,
         const QString &propertyName,
         const QVariant &bindingExpression,
@@ -369,7 +369,7 @@ quint32 QmlEngineDebugClient::setBindingForObject(
         QString source, int line)
 {
     quint32 id = 0;
-    if (status() == QDeclarativeDebugClient::Enabled && objectDebugId != -1) {
+    if (status() == QmlDebugClient::Enabled && objectDebugId != -1) {
         id = getId();
         QByteArray message;
         QDataStream ds(&message, QIODevice::WriteOnly);
@@ -380,12 +380,12 @@ quint32 QmlEngineDebugClient::setBindingForObject(
     return id;
 }
 
-quint32 QmlEngineDebugClient::resetBindingForObject(
+quint32 BaseEngineDebugClient::resetBindingForObject(
         int objectDebugId,
         const QString &propertyName)
 {
     quint32 id = 0;
-    if (status() == QDeclarativeDebugClient::Enabled && objectDebugId != -1) {
+    if (status() == QmlDebugClient::Enabled && objectDebugId != -1) {
         id = getId();
         QByteArray message;
         QDataStream ds(&message, QIODevice::WriteOnly);
@@ -395,12 +395,12 @@ quint32 QmlEngineDebugClient::resetBindingForObject(
     return id;
 }
 
-quint32 QmlEngineDebugClient::setMethodBody(
+quint32 BaseEngineDebugClient::setMethodBody(
         int objectDebugId, const QString &methodName,
         const QString &methodBody)
 {
     quint32 id = 0;
-    if (status() == QDeclarativeDebugClient::Enabled && objectDebugId != -1) {
+    if (status() == QmlDebugClient::Enabled && objectDebugId != -1) {
         id = getId();
         QByteArray message;
         QDataStream ds(&message, QIODevice::WriteOnly);
@@ -411,4 +411,4 @@ quint32 QmlEngineDebugClient::setMethodBody(
     return id;
 }
 
-} // namespace QmlJsDebugClient
+} // namespace QmlDebug
diff --git a/src/libs/qmljsdebugclient/qmlenginedebugclient.h b/src/libs/qmldebug/baseenginedebugclient.h
index a2fa425cba..1c648892d7 100644
--- a/src/libs/qmljsdebugclient/qmlenginedebugclient.h
+++ b/src/libs/qmldebug/baseenginedebugclient.h
@@ -29,29 +29,29 @@
 **
 **************************************************************************/
 
-#ifndef QMLENGINEDEBUGCLIENT_H
-#define QMLENGINEDEBUGCLIENT_H
+#ifndef BASEENGINEDEBUGCLIENT_H
+#define BASEENGINEDEBUGCLIENT_H
 
-#include "qmljsdebugclient_global.h"
-#include "qdeclarativedebugclient.h"
+#include "qmldebug_global.h"
+#include "qmldebugclient.h"
 #include <qurl.h>
 #include <qvariant.h>
 
-namespace QmlJsDebugClient {
+namespace QmlDebug {
 
-class QDeclarativeDebugConnection;
+class QmlDebugConnection;
 class QmlDebugPropertyReference;
 class QmlDebugContextReference;
 class QmlDebugObjectReference;
 class QmlDebugFileReference;
 class QmlDebugEngineReference;
 
-class QMLJSDEBUGCLIENT_EXPORT QmlEngineDebugClient : public QDeclarativeDebugClient
+class QMLDEBUG_EXPORT BaseEngineDebugClient : public QmlDebugClient
 {
     Q_OBJECT
 public:
-    QmlEngineDebugClient(const QString &clientName,
-                         QDeclarativeDebugConnection *conn);
+    BaseEngineDebugClient(const QString &clientName,
+                         QmlDebugConnection *conn);
 
     quint32 addWatch(const QmlDebugPropertyReference &property);
     quint32 addWatch(const QmlDebugContextReference &context, const QString &id);
@@ -77,7 +77,7 @@ public:
                           const QString &methodBody);
 
 signals:
-    void newStatus(QDeclarativeDebugClient::Status status);
+    void newStatus(QmlDebugClient::Status status);
     void newObjects();
     void valueChanged(int debugId, const QByteArray &name,
                       const QVariant &value);
@@ -106,7 +106,7 @@ public:
     int columnNumber() const { return m_columnNumber; }
 
 private:
-    friend class QmlEngineDebugClient;
+    friend class BaseEngineDebugClient;
     QUrl m_url;
     int m_lineNumber;
     int m_columnNumber;
@@ -122,7 +122,7 @@ public:
     QString name() const { return m_name; }
 
 private:
-    friend class QmlEngineDebugClient;
+    friend class BaseEngineDebugClient;
     int m_debugId;
     QString m_name;
 };
@@ -168,7 +168,7 @@ public:
     }
 
 private:
-    friend class QmlEngineDebugClient;
+    friend class BaseEngineDebugClient;
     int m_debugId;
     int m_parentId;
     QString m_className;
@@ -193,7 +193,7 @@ public:
     QList<QmlDebugContextReference> contexts() const { return m_contexts; }
 
 private:
-    friend class QmlEngineDebugClient;
+    friend class BaseEngineDebugClient;
     int m_debugId;
     QString m_name;
     QList<QmlDebugObjectReference> m_objects;
@@ -213,7 +213,7 @@ public:
     bool hasNotifySignal() const { return m_hasNotifySignal; }
 
 private:
-    friend class QmlEngineDebugClient;
+    friend class BaseEngineDebugClient;
     int m_objectDebugId;
     QString m_name;
     QVariant m_value;
@@ -222,11 +222,11 @@ private:
     bool m_hasNotifySignal;
 };
 
-} // namespace QmlJsDebugClient
+} // namespace QmlDebug
 
-Q_DECLARE_METATYPE(QmlJsDebugClient::QmlDebugObjectReference)
-Q_DECLARE_METATYPE(QmlJsDebugClient::QmlDebugEngineReference)
-Q_DECLARE_METATYPE(QmlJsDebugClient::QmlDebugEngineReferenceList)
-Q_DECLARE_METATYPE(QmlJsDebugClient::QmlDebugContextReference)
+Q_DECLARE_METATYPE(QmlDebug::QmlDebugObjectReference)
+Q_DECLARE_METATYPE(QmlDebug::QmlDebugEngineReference)
+Q_DECLARE_METATYPE(QmlDebug::QmlDebugEngineReferenceList)
+Q_DECLARE_METATYPE(QmlDebug::QmlDebugContextReference)
 
-#endif // QMLENGINEDEBUGCLIENT_H
+#endif // BASEENGINEDEBUGCLIENT_H
diff --git a/src/libs/qmljsdebugclient/qdeclarativeengineclient.h b/src/libs/qmldebug/declarativeenginedebugclient.h
index 841ec03a51..df737e10d0 100644
--- a/src/libs/qmljsdebugclient/qdeclarativeengineclient.h
+++ b/src/libs/qmldebug/declarativeenginedebugclient.h
@@ -29,25 +29,25 @@
 **
 **************************************************************************/
 
-#ifndef QDECLARATIVEENGINECLIENT_H
-#define QDECLARATIVEENGINECLIENT_H
+#ifndef DECLARATIVEENGINEDEBUGCLIENT_H
+#define DECLARATIVEENGINEDEBUGCLIENT_H
 
-#include "qmlenginedebugclient.h"
+#include "baseenginedebugclient.h"
 
-namespace QmlJsDebugClient {
+namespace QmlDebug {
 
-class QDeclarativeDebugConnection;
+class QmlDebugConnection;
 
-class QMLJSDEBUGCLIENT_EXPORT QDeclarativeEngineClient : public QmlEngineDebugClient
+class QMLDEBUG_EXPORT DeclarativeEngineDebugCLient : public BaseEngineDebugClient
 {
     Q_OBJECT
 public:
-    QDeclarativeEngineClient(QDeclarativeDebugConnection *conn)
-        : QmlEngineDebugClient(QLatin1String("QDeclarativeEngine"), conn)
+    DeclarativeEngineDebugCLient(QmlDebugConnection *conn)
+        : BaseEngineDebugClient(QLatin1String("QDeclarativeEngine"), conn)
     {
     }
 };
 
-} // namespace QmlJsDebugClient
+} // namespace QmlDebug
 
-#endif // QDECLARATIVEENGINECLIENT_H
+#endif // DECLARATIVEENGINEDEBUGCLIENT_H
diff --git a/src/libs/qmljsdebugclient/qdebugmessageclient.cpp b/src/libs/qmldebug/qdebugmessageclient.cpp
index 6da461eb3d..cb342a97cb 100644
--- a/src/libs/qmljsdebugclient/qdebugmessageclient.cpp
+++ b/src/libs/qmldebug/qdebugmessageclient.cpp
@@ -32,10 +32,10 @@
 
 #include "qdebugmessageclient.h"
 
-namespace QmlJsDebugClient {
+namespace QmlDebug {
 
-QDebugMessageClient::QDebugMessageClient(QDeclarativeDebugConnection *client)
-    : QDeclarativeDebugClient(QLatin1String("DebugMessages"), client)
+QDebugMessageClient::QDebugMessageClient(QmlDebugConnection *client)
+    : QmlDebugClient(QLatin1String("DebugMessages"), client)
 {
 }
 
@@ -82,4 +82,4 @@ void QDebugMessageClient::messageReceived(const QByteArray &data)
     }
 }
 
-} // namespace QmlJsDebugClient
+} // namespace QmlDebug
diff --git a/src/libs/qmljsdebugclient/qdebugmessageclient.h b/src/libs/qmldebug/qdebugmessageclient.h
index 36381392d3..3deb95228c 100644
--- a/src/libs/qmljsdebugclient/qdebugmessageclient.h
+++ b/src/libs/qmldebug/qdebugmessageclient.h
@@ -33,10 +33,10 @@
 #ifndef QDEBUGMESSAGECLIENT_H
 #define QDEBUGMESSAGECLIENT_H
 
-#include "qdeclarativedebugclient.h"
-#include "qmljsdebugclient_global.h"
+#include "qmldebugclient.h"
+#include "qmldebug_global.h"
 
-namespace QmlJsDebugClient {
+namespace QmlDebug {
 
 class QDebugMessageClientPrivate;
 struct QDebugContextInfo
@@ -46,12 +46,12 @@ struct QDebugContextInfo
     QString function;
 };
 
-class QMLJSDEBUGCLIENT_EXPORT QDebugMessageClient : public QDeclarativeDebugClient
+class QMLDEBUG_EXPORT QDebugMessageClient : public QmlDebugClient
 {
     Q_OBJECT
 
 public:
-    explicit QDebugMessageClient(QDeclarativeDebugConnection *client);
+    explicit QDebugMessageClient(QmlDebugConnection *client);
     ~QDebugMessageClient();
 
 protected:
@@ -59,15 +59,15 @@ protected:
     virtual void messageReceived(const QByteArray &);
 
 signals:
-    void newStatus(QDeclarativeDebugClient::Status);
+    void newStatus(QmlDebugClient::Status);
     void message(QtMsgType, const QString &,
-                 const QmlJsDebugClient::QDebugContextInfo &);
+                 const QmlDebug::QDebugContextInfo &);
 
 private:
     class QDebugMessageClientPrivate *d;
     Q_DISABLE_COPY(QDebugMessageClient)
 };
 
-} // namespace QmlJsDebugClient
+} // namespace QmlDebug
 
 #endif // QDEBUGMESSAGECLIENT_H
diff --git a/src/libs/qmldebug/qmldebug-lib.pri b/src/libs/qmldebug/qmldebug-lib.pri
new file mode 100644
index 0000000000..d75a912445
--- /dev/null
+++ b/src/libs/qmldebug/qmldebug-lib.pri
@@ -0,0 +1,33 @@
+contains(CONFIG, dll) {
+    DEFINES += QMLDEBUG_LIB
+} else {
+    DEFINES += QMLDEBUG_STATIC_LIB
+}
+
+INCLUDEPATH += $$PWD/..
+
+HEADERS += \
+    $$PWD/qmlprofilereventlocation.h \
+    $$PWD/qmldebugclient.h \
+    $$PWD/baseenginedebugclient.h \
+    $$PWD/declarativeenginedebugclient.h \
+    $$PWD/qmloutputparser.h \
+    $$PWD/qmldebug_global.h \
+    $$PWD/qmlprofilereventtypes.h \
+    $$PWD/qmlprofilertraceclient.h \
+    $$PWD/qpacketprotocol.h \
+    $$PWD/qv8profilerclient.h \
+    $$PWD/qmldebugconstants.h \
+    $$PWD/qdebugmessageclient.h \
+    $$PWD/qmlenginedebugclient.h
+
+SOURCES += \
+    $$PWD/qmldebugclient.cpp \
+    $$PWD/baseenginedebugclient.cpp \
+    $$PWD/qmloutputparser.cpp \
+    $$PWD/qmlprofilertraceclient.cpp \
+    $$PWD/qpacketprotocol.cpp \
+    $$PWD/qv8profilerclient.cpp \
+    $$PWD/qdebugmessageclient.cpp \
+    $$PWD/qmlenginedebugclient.cpp
+
diff --git a/src/libs/qmldebug/qmldebug.pri b/src/libs/qmldebug/qmldebug.pri
new file mode 100644
index 0000000000..d953e5e4c7
--- /dev/null
+++ b/src/libs/qmldebug/qmldebug.pri
@@ -0,0 +1,3 @@
+include(../symbianutils/symbianutils.pri)
+
+LIBS *= -l$$qtLibraryName(QmlDebug)
diff --git a/src/libs/qmldebug/qmldebug.pro b/src/libs/qmldebug/qmldebug.pro
new file mode 100644
index 0000000000..5356482713
--- /dev/null
+++ b/src/libs/qmldebug/qmldebug.pro
@@ -0,0 +1,11 @@
+TEMPLATE = lib
+TARGET = QmlDebug
+QT += network
+
+include(../../qtcreatorlibrary.pri)
+include(../symbianutils/symbianutils.pri)
+include(qmldebug-lib.pri)
+
+OTHER_FILES += \
+    qmldebug.pri
+
diff --git a/src/libs/qmljsdebugclient/qmljsdebugclient.qbs b/src/libs/qmldebug/qmldebug.qbs
index 926c4e283c..9a3d373aa3 100644
--- a/src/libs/qmljsdebugclient/qmljsdebugclient.qbs
+++ b/src/libs/qmldebug/qmldebug.qbs
@@ -2,15 +2,14 @@ import qbs.base 1.0
 import "../QtcLibrary.qbs" as QtcLibrary
 
 QtcLibrary {
-    name: "QmlJSDebugClient"
+    name: "QmlDebug"
 
     cpp.includePaths: [
         ".",
         ".."
     ]
     cpp.defines: [
-        "QMLJSDEBUGCLIENT_LIBRARY",
-        "QMLJSDEBUGCLIENT_LIB"
+        "QMLDEBUG_LIB"
     ]
 
     Depends { name: "cpp" }
@@ -19,27 +18,27 @@ QtcLibrary {
     Depends { name: "symbianutils" }
 
     files: [
-        "qdeclarativedebugclient.cpp",
-        "qdeclarativeoutputparser.cpp",
-        "qdeclarativeoutputparser.h",
-        "qmljsdebugclient_global.h",
-        "qmljsdebugclientconstants.h",
+        "baseenginedebugclient.cpp",
+        "baseenginedebugclient.h",
+        "qdebugmessageclient.cpp",
+        "qdebugmessageclient.h",
+        "qmldebugclient.cpp",
+        "qmldebugclient.h",
+        "qmldebugconstants.h",
+        "qmldebug_global.h",
+        "qmloutputparser.cpp",
+        "qmloutputparser.h",
         "qmlprofilereventlocation.h",
+        "qmlprofilereventtypes.h",
         "qmlprofilertraceclient.cpp",
+        "qmlprofilertraceclient.h",
         "qpacketprotocol.cpp",
-        "qv8profilerclient.cpp",
-        "qv8profilerclient.h",
-        "qdeclarativedebugclient.h",
+        "qpacketprotocol.h",
+        "declarativeenginedebugclient.h",
         "qmlenginedebugclient.cpp",
         "qmlenginedebugclient.h",
-        "qmlprofilereventtypes.h",
-        "qmlprofilertraceclient.h",
-        "qpacketprotocol.h",
-        "qdebugmessageclient.cpp",
-        "qdebugmessageclient.h",
-        "qdeclarativeengineclient.h",
-        "qmldebuggerclient.h",
-        "qmldebuggerclient.cpp"
+        "qv8profilerclient.cpp",
+        "qv8profilerclient.h",
     ]
 
     ProductModule {
diff --git a/src/libs/qmljsdebugclient/qmljsdebugclient_global.h b/src/libs/qmldebug/qmldebug_global.h
index e102099b17..eb9cde19b6 100644
--- a/src/libs/qmljsdebugclient/qmljsdebugclient_global.h
+++ b/src/libs/qmldebug/qmldebug_global.h
@@ -33,12 +33,12 @@
 #ifndef QMLJSDEBUGCLIENT_GLOBAL_H
 #define QMLJSDEBUGCLIENT_GLOBAL_H
 
-#if defined(QMLJSDEBUGCLIENT_LIB)
-#  define QMLJSDEBUGCLIENT_EXPORT Q_DECL_EXPORT
-#elif defined(QMLJSDEBUGCLIENT_STATIC_LIB)
-#  define QMLJSDEBUGCLIENT_EXPORT
+#if defined(QMLDEBUG_LIB)
+#  define QMLDEBUG_EXPORT Q_DECL_EXPORT
+#elif defined(QMLDEBUG_STATIC_LIB)
+#  define QMLDEBUG_EXPORT
 #else
-#  define QMLJSDEBUGCLIENT_EXPORT Q_DECL_IMPORT
+#  define QMLDEBUG_EXPORT Q_DECL_IMPORT
 #endif
 
 #endif // QMLJSDEBUGCLIENT_GLOBAL_H
diff --git a/src/libs/qmljsdebugclient/qdeclarativedebugclient.cpp b/src/libs/qmldebug/qmldebugclient.cpp
index 8d2146311b..9f520ff5ba 100644
--- a/src/libs/qmljsdebugclient/qdeclarativedebugclient.cpp
+++ b/src/libs/qmldebug/qmldebugclient.cpp
@@ -29,7 +29,7 @@
 **
 **************************************************************************/
 
-#include "qdeclarativedebugclient.h"
+#include "qmldebugclient.h"
 
 #include "qpacketprotocol.h"
 
@@ -38,35 +38,35 @@
 #include <qnetworkproxy.h>
 #include <symbiandevicemanager.h>
 
-namespace QmlJsDebugClient {
+namespace QmlDebug {
 
 const int protocolVersion = 1;
 const QString serverId = QLatin1String("QDeclarativeDebugServer");
 const QString clientId = QLatin1String("QDeclarativeDebugClient");
 static const uchar KQmlOstProtocolId = 0x94;
 
-class QDeclarativeDebugClientPrivate
+class QmlDebugClientPrivate
 {
-    //    Q_DECLARE_PUBLIC(QDeclarativeDebugClient)
+    //    Q_DECLARE_PUBLIC(QmlDebugClient)
 public:
-    QDeclarativeDebugClientPrivate();
+    QmlDebugClientPrivate();
 
     QString name;
-    QDeclarativeDebugConnection *connection;
+    QmlDebugConnection *connection;
 };
 
-class QDeclarativeDebugConnectionPrivate : public QObject
+class QmlDebugConnectionPrivate : public QObject
 {
     Q_OBJECT
 public:
-    QDeclarativeDebugConnectionPrivate(QDeclarativeDebugConnection *c);
-    QDeclarativeDebugConnection *q;
+    QmlDebugConnectionPrivate(QmlDebugConnection *c);
+    QmlDebugConnection *q;
     QPacketProtocol *protocol;
     QIODevice *device; // Currently either a QTcpSocket or a SymbianUtils::OstChannel
 
     bool gotHello;
     QHash <QString, float> serverPlugins;
-    QHash<QString, QDeclarativeDebugClient *> plugins;
+    QHash<QString, QmlDebugClient *> plugins;
 
     void advertisePlugins();
     void connectDeviceSignals();
@@ -77,7 +77,7 @@ public Q_SLOTS:
     void deviceAboutToClose();
 };
 
-QDeclarativeDebugConnectionPrivate::QDeclarativeDebugConnectionPrivate(QDeclarativeDebugConnection *c)
+QmlDebugConnectionPrivate::QmlDebugConnectionPrivate(QmlDebugConnection *c)
     : QObject(c), q(c), protocol(0), device(0), gotHello(false)
 {
     protocol = new QPacketProtocol(q, this);
@@ -85,7 +85,7 @@ QDeclarativeDebugConnectionPrivate::QDeclarativeDebugConnectionPrivate(QDeclarat
     QObject::connect(protocol, SIGNAL(readyRead()), this, SLOT(readyRead()));
 }
 
-void QDeclarativeDebugConnectionPrivate::advertisePlugins()
+void QmlDebugConnectionPrivate::advertisePlugins()
 {
     if (!q->isConnected() || !gotHello)
         return;
@@ -96,7 +96,7 @@ void QDeclarativeDebugConnectionPrivate::advertisePlugins()
     q->flush();
 }
 
-void QDeclarativeDebugConnectionPrivate::connected()
+void QmlDebugConnectionPrivate::connected()
 {
     QPacket pack;
     pack << serverId << 0 << protocolVersion << plugins.keys();
@@ -104,7 +104,7 @@ void QDeclarativeDebugConnectionPrivate::connected()
     q->flush();
 }
 
-void QDeclarativeDebugConnectionPrivate::readyRead()
+void QmlDebugConnectionPrivate::readyRead()
 {
     if (!gotHello) {
         QPacket pack = protocol->read();
@@ -141,17 +141,17 @@ void QDeclarativeDebugConnectionPrivate::readyRead()
         }
 
         if (!validHello) {
-            qWarning("QDeclarativeDebugConnection: Invalid hello message");
+            qWarning("QML Debug Client: Invalid hello message");
             QObject::disconnect(protocol, SIGNAL(readyRead()), this, SLOT(readyRead()));
             return;
         }
         gotHello = true;
 
-        QHash<QString, QDeclarativeDebugClient *>::Iterator iter = plugins.begin();
+        QHash<QString, QmlDebugClient *>::Iterator iter = plugins.begin();
         for (; iter != plugins.end(); ++iter) {
-            QDeclarativeDebugClient::Status newStatus = QDeclarativeDebugClient::Unavailable;
+            QmlDebugClient::Status newStatus = QmlDebugClient::Unavailable;
             if (serverPlugins.contains(iter.key()))
-                newStatus = QDeclarativeDebugClient::Enabled;
+                newStatus = QmlDebugClient::Enabled;
             iter.value()->statusChanged(newStatus);
         }
     }
@@ -185,12 +185,12 @@ void QDeclarativeDebugConnectionPrivate::readyRead()
                     serverPlugins.insert(pluginNames.at(i), pluginVersion);
                 }
 
-                QHash<QString, QDeclarativeDebugClient *>::Iterator iter = plugins.begin();
+                QHash<QString, QmlDebugClient *>::Iterator iter = plugins.begin();
                 for (; iter != plugins.end(); ++iter) {
                     const QString pluginName = iter.key();
-                    QDeclarativeDebugClient::Status newStatus = QDeclarativeDebugClient::Unavailable;
+                    QmlDebugClient::Status newStatus = QmlDebugClient::Unavailable;
                     if (serverPlugins.contains(pluginName))
-                        newStatus = QDeclarativeDebugClient::Enabled;
+                        newStatus = QmlDebugClient::Enabled;
 
                     if (oldServerPlugins.contains(pluginName)
                             != serverPlugins.contains(pluginName)) {
@@ -198,16 +198,16 @@ void QDeclarativeDebugConnectionPrivate::readyRead()
                     }
                 }
             } else {
-                qWarning() << "QDeclarativeDebugConnection: Unknown control message id" << op;
+                qWarning() << "QML Debug Client: Unknown control message id" << op;
             }
         } else {
             QByteArray message;
             pack >> message;
 
-            QHash<QString, QDeclarativeDebugClient *>::Iterator iter =
+            QHash<QString, QmlDebugClient *>::Iterator iter =
                     plugins.find(name);
             if (iter == plugins.end()) {
-                qWarning() << "QDeclarativeDebugConnection: Message received for missing plugin" << name;
+                qWarning() << "QML Debug Client: Message received for missing plugin" << name;
             } else {
                 (*iter)->messageReceived(message);
             }
@@ -215,73 +215,73 @@ void QDeclarativeDebugConnectionPrivate::readyRead()
     }
 }
 
-void QDeclarativeDebugConnectionPrivate::deviceAboutToClose()
+void QmlDebugConnectionPrivate::deviceAboutToClose()
 {
     // This is nasty syntax but we want to emit our own aboutToClose signal (by calling QIODevice::close())
     // without calling the underlying device close fn as that would cause an infinite loop
     q->QIODevice::close();
 }
 
-QDeclarativeDebugConnection::QDeclarativeDebugConnection(QObject *parent)
-    : QIODevice(parent), d(new QDeclarativeDebugConnectionPrivate(this))
+QmlDebugConnection::QmlDebugConnection(QObject *parent)
+    : QIODevice(parent), d(new QmlDebugConnectionPrivate(this))
 {
 }
 
-QDeclarativeDebugConnection::~QDeclarativeDebugConnection()
+QmlDebugConnection::~QmlDebugConnection()
 {
-    QHash<QString, QDeclarativeDebugClient*>::iterator iter = d->plugins.begin();
+    QHash<QString, QmlDebugClient*>::iterator iter = d->plugins.begin();
     for (; iter != d->plugins.end(); ++iter) {
         iter.value()->d_func()->connection = 0;
-        iter.value()->statusChanged(QDeclarativeDebugClient::NotConnected);
+        iter.value()->statusChanged(QmlDebugClient::NotConnected);
     }
 }
 
-bool QDeclarativeDebugConnection::isConnected() const
+bool QmlDebugConnection::isConnected() const
 {
     return state() == QAbstractSocket::ConnectedState;
 }
 
-qint64 QDeclarativeDebugConnection::readData(char *data, qint64 maxSize)
+qint64 QmlDebugConnection::readData(char *data, qint64 maxSize)
 {
     return d->device->read(data, maxSize);
 }
 
-qint64 QDeclarativeDebugConnection::writeData(const char *data, qint64 maxSize)
+qint64 QmlDebugConnection::writeData(const char *data, qint64 maxSize)
 {
     return d->device->write(data, maxSize);
 }
 
-void QDeclarativeDebugConnection::internalError(QAbstractSocket::SocketError socketError)
+void QmlDebugConnection::internalError(QAbstractSocket::SocketError socketError)
 {
     setErrorString(d->device->errorString());
     emit error(socketError);
 }
 
-qint64 QDeclarativeDebugConnection::bytesAvailable() const
+qint64 QmlDebugConnection::bytesAvailable() const
 {
     return d->device->bytesAvailable();
 }
 
-bool QDeclarativeDebugConnection::isSequential() const
+bool QmlDebugConnection::isSequential() const
 {
     return true;
 }
 
-void QDeclarativeDebugConnection::close()
+void QmlDebugConnection::close()
 {
     if (isOpen()) {
         QIODevice::close();
         d->device->close();
         emit stateChanged(QAbstractSocket::UnconnectedState);
 
-        QHash<QString, QDeclarativeDebugClient*>::iterator iter = d->plugins.begin();
+        QHash<QString, QmlDebugClient*>::iterator iter = d->plugins.begin();
         for (; iter != d->plugins.end(); ++iter) {
-            iter.value()->statusChanged(QDeclarativeDebugClient::NotConnected);
+            iter.value()->statusChanged(QmlDebugClient::NotConnected);
         }
     }
 }
 
-bool QDeclarativeDebugConnection::waitForConnected(int msecs)
+bool QmlDebugConnection::waitForConnected(int msecs)
 {
     QAbstractSocket *socket = qobject_cast<QAbstractSocket*>(d->device);
     if (socket)
@@ -291,7 +291,7 @@ bool QDeclarativeDebugConnection::waitForConnected(int msecs)
 
 // For ease of refactoring we use QAbstractSocket's states even if we're actually using a OstChannel underneath
 // since serial ports have a subset of the socket states afaics
-QAbstractSocket::SocketState QDeclarativeDebugConnection::state() const
+QAbstractSocket::SocketState QmlDebugConnection::state() const
 {
     QAbstractSocket *socket = qobject_cast<QAbstractSocket*>(d->device);
     if (socket)
@@ -312,7 +312,7 @@ QAbstractSocket::SocketState QDeclarativeDebugConnection::state() const
     return QAbstractSocket::UnconnectedState;
 }
 
-void QDeclarativeDebugConnection::flush()
+void QmlDebugConnection::flush()
 {
     QAbstractSocket *socket = qobject_cast<QAbstractSocket*>(d->device);
     if (socket) {
@@ -327,7 +327,7 @@ void QDeclarativeDebugConnection::flush()
     }
 }
 
-void QDeclarativeDebugConnection::connectToHost(const QString &hostName, quint16 port)
+void QmlDebugConnection::connectToHost(const QString &hostName, quint16 port)
 {
     QTcpSocket *socket = new QTcpSocket(d);
     socket->setProxy(QNetworkProxy::NoProxy);
@@ -341,7 +341,7 @@ void QDeclarativeDebugConnection::connectToHost(const QString &hostName, quint16
     QIODevice::open(ReadWrite | Unbuffered);
 }
 
-void QDeclarativeDebugConnection::connectToOst(const QString &port)
+void QmlDebugConnection::connectToOst(const QString &port)
 {
     SymbianUtils::OstChannel *ost = SymbianUtils::SymbianDeviceManager::instance()->getOstChannel(port, KQmlOstProtocolId);
     if (ost) {
@@ -357,7 +357,7 @@ void QDeclarativeDebugConnection::connectToOst(const QString &port)
     }
 }
 
-void QDeclarativeDebugConnectionPrivate::connectDeviceSignals()
+void QmlDebugConnectionPrivate::connectDeviceSignals()
 {
     connect(device, SIGNAL(bytesWritten(qint64)), q, SIGNAL(bytesWritten(qint64)));
     connect(device, SIGNAL(readyRead()), q, SIGNAL(readyRead()));
@@ -366,16 +366,16 @@ void QDeclarativeDebugConnectionPrivate::connectDeviceSignals()
 
 //
 
-QDeclarativeDebugClientPrivate::QDeclarativeDebugClientPrivate()
+QmlDebugClientPrivate::QmlDebugClientPrivate()
     : connection(0)
 {
 }
 
-QDeclarativeDebugClient::QDeclarativeDebugClient(const QString &name, 
-                                                 QDeclarativeDebugConnection *parent)
-    : QObject(parent), d_ptr(new QDeclarativeDebugClientPrivate())
+QmlDebugClient::QmlDebugClient(const QString &name,
+                                                 QmlDebugConnection *parent)
+    : QObject(parent), d_ptr(new QmlDebugClientPrivate())
 {
-    Q_D(QDeclarativeDebugClient);
+    Q_D(QmlDebugClient);
     d->name = name;
     d->connection = parent;
 
@@ -383,7 +383,7 @@ QDeclarativeDebugClient::QDeclarativeDebugClient(const QString &name,
         return;
 
     if (d->connection->d->plugins.contains(name)) {
-        qWarning() << "QDeclarativeDebugClient: Conflicting plugin name" << name;
+        qWarning() << "QML Debug Client: Conflicting plugin name" << name;
         d->connection = 0;
     } else {
         d->connection->d->plugins.insert(name, this);
@@ -391,32 +391,32 @@ QDeclarativeDebugClient::QDeclarativeDebugClient(const QString &name,
     }
 }
 
-QDeclarativeDebugClient::~QDeclarativeDebugClient()
+QmlDebugClient::~QmlDebugClient()
 {
-    Q_D(const QDeclarativeDebugClient);
+    Q_D(const QmlDebugClient);
     if (d->connection && d->connection->d) {
         d->connection->d->plugins.remove(d->name);
         d->connection->d->advertisePlugins();
     }
 }
 
-QString QDeclarativeDebugClient::name() const
+QString QmlDebugClient::name() const
 {
-    Q_D(const QDeclarativeDebugClient);
+    Q_D(const QmlDebugClient);
     return d->name;
 }
 
-float QDeclarativeDebugClient::serviceVersion() const
+float QmlDebugClient::serviceVersion() const
 {
-    Q_D(const QDeclarativeDebugClient);
+    Q_D(const QmlDebugClient);
     if (d->connection && d->connection->d->serverPlugins.contains(d->name))
         return d->connection->d->serverPlugins.value(d->name);
     return -1;
 }
 
-QDeclarativeDebugClient::Status QDeclarativeDebugClient::status() const
+QmlDebugClient::Status QmlDebugClient::status() const
 {
-    Q_D(const QDeclarativeDebugClient);
+    Q_D(const QmlDebugClient);
     if (!d->connection
             || !d->connection->isConnected()
             || !d->connection->d->gotHello)
@@ -428,9 +428,9 @@ QDeclarativeDebugClient::Status QDeclarativeDebugClient::status() const
     return Unavailable;
 }
 
-void QDeclarativeDebugClient::sendMessage(const QByteArray &message)
+void QmlDebugClient::sendMessage(const QByteArray &message)
 {
-    Q_D(QDeclarativeDebugClient);
+    Q_D(QmlDebugClient);
     if (status() != Enabled)
         return;
 
@@ -440,14 +440,14 @@ void QDeclarativeDebugClient::sendMessage(const QByteArray &message)
     d->connection->flush();
 }
 
-void QDeclarativeDebugClient::statusChanged(Status)
+void QmlDebugClient::statusChanged(Status)
 {
 }
 
-void QDeclarativeDebugClient::messageReceived(const QByteArray &)
+void QmlDebugClient::messageReceived(const QByteArray &)
 {
 }
 
-} // namespace QmlJsDebugClient
+} // namespace QmlDebug
 
-#include <qdeclarativedebugclient.moc>
+#include <qmldebugclient.moc>
diff --git a/src/libs/qmljsdebugclient/qdeclarativedebugclient.h b/src/libs/qmldebug/qmldebugclient.h
index a56369fa2e..fb00a80783 100644
--- a/src/libs/qmljsdebugclient/qdeclarativedebugclient.h
+++ b/src/libs/qmldebug/qmldebugclient.h
@@ -29,22 +29,22 @@
 **
 **************************************************************************/
 
-#ifndef QDECLARATIVEDEBUGCLIENT_H
-#define QDECLARATIVEDEBUGCLIENT_H
+#ifndef QMLDEBUGCLIENT_H
+#define QMLDEBUGCLIENT_H
 
-#include "qmljsdebugclient_global.h"
+#include "qmldebug_global.h"
 #include <qtcpsocket.h>
 
-namespace QmlJsDebugClient {
+namespace QmlDebug {
 
-class QDeclarativeDebugConnectionPrivate;
-class QMLJSDEBUGCLIENT_EXPORT QDeclarativeDebugConnection : public QIODevice
+class QmlDebugConnectionPrivate;
+class QMLDEBUG_EXPORT QmlDebugConnection : public QIODevice
 {
     Q_OBJECT
-    Q_DISABLE_COPY(QDeclarativeDebugConnection)
+    Q_DISABLE_COPY(QmlDebugConnection)
 public:
-    QDeclarativeDebugConnection(QObject * = 0);
-    ~QDeclarativeDebugConnection();
+    QmlDebugConnection(QObject * = 0);
+    ~QmlDebugConnection();
 
     void connectToHost(const QString &hostName, quint16 port);
     void connectToOst(const QString &port);
@@ -70,23 +70,23 @@ private slots:
     void internalError(QAbstractSocket::SocketError error);
 
 private:
-    QDeclarativeDebugConnectionPrivate *d;
-    friend class QDeclarativeDebugClient;
-    friend class QDeclarativeDebugClientPrivate;
+    QmlDebugConnectionPrivate *d;
+    friend class QmlDebugClient;
+    friend class QmlDebugClientPrivate;
 };
 
-class QDeclarativeDebugClientPrivate;
-class QMLJSDEBUGCLIENT_EXPORT QDeclarativeDebugClient : public QObject
+class QmlDebugClientPrivate;
+class QMLDEBUG_EXPORT QmlDebugClient : public QObject
 {
     Q_OBJECT
-    Q_DECLARE_PRIVATE(QDeclarativeDebugClient)
-    Q_DISABLE_COPY(QDeclarativeDebugClient)
+    Q_DECLARE_PRIVATE(QmlDebugClient)
+    Q_DISABLE_COPY(QmlDebugClient)
 
 public:
     enum Status { NotConnected, Unavailable, Enabled };
 
-    QDeclarativeDebugClient(const QString &, QDeclarativeDebugConnection *parent);
-    ~QDeclarativeDebugClient();
+    QmlDebugClient(const QString &, QmlDebugConnection *parent);
+    ~QmlDebugClient();
 
     QString name() const;
     float serviceVersion() const;
@@ -99,11 +99,11 @@ protected:
     virtual void messageReceived(const QByteArray &);
 
 private:
-    friend class QDeclarativeDebugConnection;
-    friend class QDeclarativeDebugConnectionPrivate;
-    QScopedPointer<QDeclarativeDebugClientPrivate> d_ptr;
+    friend class QmlDebugConnection;
+    friend class QmlDebugConnectionPrivate;
+    QScopedPointer<QmlDebugClientPrivate> d_ptr;
 };
 
-} // namespace QmlJsDebugClient
+} // namespace QmlDebug
 
-#endif // QDECLARATIVEDEBUGCLIENT_H
+#endif // QMLDEBUGCLIENT_H
diff --git a/src/libs/qmljsdebugclient/qmljsdebugclientconstants.h b/src/libs/qmldebug/qmldebugconstants.h
index 02c5e4a0d4..a9fce2c7e8 100644
--- a/src/libs/qmljsdebugclient/qmljsdebugclientconstants.h
+++ b/src/libs/qmldebug/qmldebugconstants.h
@@ -30,10 +30,10 @@
 **
 **************************************************************************/
 
-#ifndef QMLJSDEBUGCLIENTCONSTANTS_H
-#define QMLJSDEBUGCLIENTCONSTANTS_H
+#ifndef QMLDEBUGCONSTANTS_H
+#define QMLDEBUGCONSTANTS_H
 
-namespace QmlJsDebugClient {
+namespace QmlDebug {
 namespace Constants {
 
 const char STR_WAITING_FOR_CONNECTION[] = "Waiting for connection ";
@@ -48,6 +48,6 @@ const char QML_DEBUGGER[] = "QmlDebugger";
 const float CURRENT_SUPPORTED_VERSION = 2.0;
 
 } // namespace Constants
-} // namespace QmlJsDebugClient
+} // namespace QmlDebug
 
-#endif // QMLJSDEBUGCLIENTCONSTANTS_H
+#endif // QMLDEBUGCONSTANTS_H
diff --git a/src/libs/qmljsdebugclient/qmldebuggerclient.cpp b/src/libs/qmldebug/qmlenginedebugclient.cpp
index 3ab14966ee..9f5369506d 100644
--- a/src/libs/qmljsdebugclient/qmldebuggerclient.cpp
+++ b/src/libs/qmldebug/qmlenginedebugclient.cpp
@@ -29,18 +29,18 @@
 **
 **************************************************************************/
 
-#include "qmldebuggerclient.h"
-#include "qmljsdebugclientconstants.h"
+#include "qmlenginedebugclient.h"
+#include "qmldebugconstants.h"
 
-namespace QmlJsDebugClient {
+namespace QmlDebug {
 
-QmlDebuggerClient::QmlDebuggerClient(
-        QDeclarativeDebugConnection *connection)
-    : QmlEngineDebugClient(QLatin1String(Constants::QML_DEBUGGER), connection)
+QmlEngineDebugClient::QmlEngineDebugClient(
+        QmlDebugConnection *connection)
+    : BaseEngineDebugClient(QLatin1String(Constants::QML_DEBUGGER), connection)
 {
 }
 
-quint32 QmlDebuggerClient::setBindingForObject(
+quint32 QmlEngineDebugClient::setBindingForObject(
         int objectDebugId,
         const QString &propertyName,
         const QVariant &bindingExpression,
@@ -48,7 +48,7 @@ quint32 QmlDebuggerClient::setBindingForObject(
         QString source, int line)
 {
     quint32 id = 0;
-    if (status() == QDeclarativeDebugClient::Enabled && objectDebugId != -1) {
+    if (status() == QmlDebugClient::Enabled && objectDebugId != -1) {
         id = getId();
         QByteArray message;
         QDataStream ds(&message, QIODevice::WriteOnly);
@@ -59,12 +59,12 @@ quint32 QmlDebuggerClient::setBindingForObject(
     return id;
 }
 
-quint32 QmlDebuggerClient::resetBindingForObject(
+quint32 QmlEngineDebugClient::resetBindingForObject(
         int objectDebugId,
         const QString &propertyName)
 {
     quint32 id = 0;
-    if (status() == QDeclarativeDebugClient::Enabled && objectDebugId != -1) {
+    if (status() == QmlDebugClient::Enabled && objectDebugId != -1) {
         id = getId();
         QByteArray message;
         QDataStream ds(&message, QIODevice::WriteOnly);
@@ -74,12 +74,12 @@ quint32 QmlDebuggerClient::resetBindingForObject(
     return id;
 }
 
-quint32 QmlDebuggerClient::setMethodBody(
+quint32 QmlEngineDebugClient::setMethodBody(
         int objectDebugId, const QString &methodName,
         const QString &methodBody)
 {
     quint32 id = 0;
-    if (status() == QDeclarativeDebugClient::Enabled && objectDebugId != -1) {
+    if (status() == QmlDebugClient::Enabled && objectDebugId != -1) {
         id = getId();
         QByteArray message;
         QDataStream ds(&message, QIODevice::WriteOnly);
@@ -90,4 +90,4 @@ quint32 QmlDebuggerClient::setMethodBody(
     return id;
 }
 
-} // namespace QmlJsDebugClient
+} // namespace QmlDebug
diff --git a/src/libs/qmljsdebugclient/qmldebuggerclient.h b/src/libs/qmldebug/qmlenginedebugclient.h
index 9fa453c17f..22119f75df 100644
--- a/src/libs/qmljsdebugclient/qmldebuggerclient.h
+++ b/src/libs/qmldebug/qmlenginedebugclient.h
@@ -29,20 +29,20 @@
 **
 **************************************************************************/
 
-#ifndef QMLDEBUGGERCLIENT_H
-#define QMLDEBUGGERCLIENT_H
+#ifndef QMLENGINEDEBUGCLIENT_H
+#define QMLENGINEDEBUGCLIENT_H
 
-#include "qmlenginedebugclient.h"
+#include "baseenginedebugclient.h"
 
-namespace QmlJsDebugClient {
+namespace QmlDebug {
 
-class QDeclarativeDebugConnection;
+class QmlDebugConnection;
 
-class QMLJSDEBUGCLIENT_EXPORT QmlDebuggerClient : public QmlEngineDebugClient
+class QMLDEBUG_EXPORT QmlEngineDebugClient : public BaseEngineDebugClient
 {
     Q_OBJECT
 public:
-    explicit QmlDebuggerClient(QDeclarativeDebugConnection *conn);
+    explicit QmlEngineDebugClient(QmlDebugConnection *conn);
 
     quint32 setBindingForObject(int objectDebugId, const QString &propertyName,
                                 const QVariant &bindingExpression,
@@ -53,6 +53,6 @@ public:
                           const QString &methodBody);
 };
 
-} // namespace QmlJsDebugClient
+} // namespace QmlDebug
 
-#endif // QMLDEBUGGERCLIENT_H
+#endif // QMLENGINEDEBUGCLIENT_H
diff --git a/src/libs/qmljsdebugclient/qdeclarativeoutputparser.cpp b/src/libs/qmldebug/qmloutputparser.cpp
index 31abb34fa4..922cece816 100644
--- a/src/libs/qmljsdebugclient/qdeclarativeoutputparser.cpp
+++ b/src/libs/qmldebug/qmloutputparser.cpp
@@ -29,23 +29,23 @@
 **
 **************************************************************************/
 
-#include "qdeclarativeoutputparser.h"
-#include "qmljsdebugclientconstants.h"
+#include "qmloutputparser.h"
+#include "qmldebugconstants.h"
 #include <QRegExp>
 
-namespace QmlJsDebugClient {
+namespace QmlDebug {
 
-QDeclarativeOutputParser::QDeclarativeOutputParser(QObject *parent)
+QmlOutputParser::QmlOutputParser(QObject *parent)
     : QObject(parent)
 {
 }
 
-void QDeclarativeOutputParser::setNoOutputText(const QString &text)
+void QmlOutputParser::setNoOutputText(const QString &text)
 {
     m_noOutputText = text;
 }
 
-void QDeclarativeOutputParser::processOutput(const QString &output)
+void QmlOutputParser::processOutput(const QString &output)
 {
     m_buffer.append(output);
 
@@ -117,4 +117,4 @@ void QDeclarativeOutputParser::processOutput(const QString &output)
     }
 }
 
-} // namespace QmLJsDebugClient
+} // namespace QmlDebug
diff --git a/src/libs/qmljsdebugclient/qdeclarativeoutputparser.h b/src/libs/qmldebug/qmloutputparser.h
index 7c39a7b973..05242aa98e 100644
--- a/src/libs/qmljsdebugclient/qdeclarativeoutputparser.h
+++ b/src/libs/qmldebug/qmloutputparser.h
@@ -29,20 +29,20 @@
 **
 **************************************************************************/
 
-#ifndef QDECLARATIVEOUTPUTPARSER_H
-#define QDECLARATIVEOUTPUTPARSER_H
+#ifndef QMLOUTPUTPARSER_H
+#define QMLOUTPUTPARSER_H
 
-#include "qmljsdebugclient_global.h"
+#include "qmldebug_global.h"
 
 #include <QObject>
 
-namespace QmlJsDebugClient {
+namespace QmlDebug {
 
-class QMLJSDEBUGCLIENT_EXPORT QDeclarativeOutputParser : public QObject
+class QMLDEBUG_EXPORT QmlOutputParser : public QObject
 {
     Q_OBJECT
 public:
-    QDeclarativeOutputParser(QObject *parent = 0);
+    QmlOutputParser(QObject *parent = 0);
 
     void setNoOutputText(const QString &text);
     void processOutput(const QString &output);
@@ -60,6 +60,6 @@ private:
     QString m_buffer;
 };
 
-} // namespace QmLJsDebugClient
+} // namespace QmlDebug
 
-#endif // QDECLARATIVEOUTPUTPARSER_H
+#endif // QMLOUTPUTPARSER_H
diff --git a/src/libs/qmljsdebugclient/qmlprofilereventlocation.h b/src/libs/qmldebug/qmlprofilereventlocation.h
index cb317fd2e5..f5030efeb0 100644
--- a/src/libs/qmljsdebugclient/qmlprofilereventlocation.h
+++ b/src/libs/qmldebug/qmlprofilereventlocation.h
@@ -33,13 +33,13 @@
 #ifndef QMLPROFILEREVENTLOCATION_H
 #define QMLPROFILEREVENTLOCATION_H
 
-#include "qmljsdebugclient_global.h"
+#include "qmldebug_global.h"
 
 #include <QString>
 
-namespace QmlJsDebugClient {
+namespace QmlDebug {
 
-struct QMLJSDEBUGCLIENT_EXPORT QmlEventLocation
+struct QMLDEBUG_EXPORT QmlEventLocation
 {
     QmlEventLocation() : line(-1),column(-1) {}
     QmlEventLocation(const QString &file, int lineNumber, int columnNumber) : filename(file), line(lineNumber), column(columnNumber) {}
diff --git a/src/libs/qmljsdebugclient/qmlprofilereventtypes.h b/src/libs/qmldebug/qmlprofilereventtypes.h
index 02e102f039..8320dc7aed 100644
--- a/src/libs/qmljsdebugclient/qmlprofilereventtypes.h
+++ b/src/libs/qmldebug/qmlprofilereventtypes.h
@@ -33,7 +33,7 @@
 #ifndef QMLPROFILEREVENTTYPES_H
 #define QMLPROFILEREVENTTYPES_H
 
-namespace QmlJsDebugClient {
+namespace QmlDebug {
 
 enum QmlEventType {
     Painting,
@@ -55,6 +55,6 @@ const char PROFILER_FILE_VERSION[] = "1.02";
 const int QML_MIN_LEVEL = 1;
 }
 
-} // namespace QmlJsDebugClient
+} // namespace QmlDebug
 
 #endif //QMLPROFILEREVENTTYPES_H
diff --git a/src/libs/qmljsdebugclient/qmlprofilertraceclient.cpp b/src/libs/qmldebug/qmlprofilertraceclient.cpp
index 01eb3f56b3..dbcd71ca54 100644
--- a/src/libs/qmljsdebugclient/qmlprofilertraceclient.cpp
+++ b/src/libs/qmldebug/qmlprofilertraceclient.cpp
@@ -32,7 +32,7 @@
 
 #include "qmlprofilertraceclient.h"
 
-namespace QmlJsDebugClient {
+namespace QmlDebug {
 
 class QmlProfilerTraceClientPrivate {
 public:
@@ -57,9 +57,9 @@ public:
     bool recording;
 };
 
-} // namespace QmlJsDebugClient
+} // namespace QmlDebug
 
-using namespace QmlJsDebugClient;
+using namespace QmlDebug;
 
 static const int GAP_TIME = 150;
 
@@ -71,8 +71,8 @@ void QmlProfilerTraceClientPrivate::sendRecordingStatus()
     q->sendMessage(ba);
 }
 
-QmlProfilerTraceClient::QmlProfilerTraceClient(QDeclarativeDebugConnection *client)
-    : QDeclarativeDebugClient(QLatin1String("CanvasFrameRate"), client)
+QmlProfilerTraceClient::QmlProfilerTraceClient(QmlDebugConnection *client)
+    : QmlDebugClient(QLatin1String("CanvasFrameRate"), client)
     , d(new QmlProfilerTraceClientPrivate(this))
 {
 }
diff --git a/src/libs/qmljsdebugclient/qmlprofilertraceclient.h b/src/libs/qmldebug/qmlprofilertraceclient.h
index 3ed2071d73..dc7716151c 100644
--- a/src/libs/qmljsdebugclient/qmlprofilertraceclient.h
+++ b/src/libs/qmldebug/qmlprofilertraceclient.h
@@ -33,17 +33,17 @@
 #ifndef QMLPROFILERTRACECLIENT_H
 #define QMLPROFILERTRACECLIENT_H
 
-#include "qdeclarativedebugclient.h"
+#include "qmldebugclient.h"
 #include "qmlprofilereventtypes.h"
 #include "qmlprofilereventlocation.h"
-#include "qmljsdebugclient_global.h"
+#include "qmldebug_global.h"
 
 #include <QStack>
 #include <QStringList>
 
-namespace QmlJsDebugClient {
+namespace QmlDebug {
 
-class QMLJSDEBUGCLIENT_EXPORT QmlProfilerTraceClient : public QmlJsDebugClient::QDeclarativeDebugClient
+class QMLDEBUG_EXPORT QmlProfilerTraceClient : public QmlDebug::QmlDebugClient
 {
     Q_OBJECT
     Q_PROPERTY(bool enabled READ isEnabled NOTIFY enabledChanged)
@@ -53,7 +53,7 @@ class QMLJSDEBUGCLIENT_EXPORT QmlProfilerTraceClient : public QmlJsDebugClient::
     using QObject::event;
 
 public:
-    QmlProfilerTraceClient(QDeclarativeDebugConnection *client);
+    QmlProfilerTraceClient(QmlDebugConnection *client);
     ~QmlProfilerTraceClient();
 
     enum EventType {
@@ -93,7 +93,7 @@ signals:
     void traceFinished( qint64 time );
     void traceStarted( qint64 time );
     void range(int type, qint64 startTime, qint64 length,
-               const QStringList &data, const QmlJsDebugClient::QmlEventLocation &location);
+               const QStringList &data, const QmlDebug::QmlEventLocation &location);
     void frame(qint64 time, int frameRate, int animationCount);
 
     void recordingChanged(bool arg);
@@ -112,6 +112,6 @@ private:
     class QmlProfilerTraceClientPrivate *d;
 };
 
-} // namespace QmlJsDebugClient
+} // namespace QmlDebug
 
 #endif // QMLPROFILERTRACECLIENT_H
diff --git a/src/libs/qmljsdebugclient/qpacketprotocol.cpp b/src/libs/qmldebug/qpacketprotocol.cpp
index f7198fa5d7..e3b5fce2be 100644
--- a/src/libs/qmljsdebugclient/qpacketprotocol.cpp
+++ b/src/libs/qmldebug/qpacketprotocol.cpp
@@ -34,7 +34,7 @@
 #include <qbuffer.h>
 #include <qelapsedtimer.h>
 
-namespace QmlJsDebugClient {
+namespace QmlDebug {
 
 static const unsigned int MAX_PACKET_SIZE = 0x7FFFFFFF;
 
@@ -537,6 +537,6 @@ QPacketAutoSend::~QPacketAutoSend()
         p->send(*this);
 }
 
-} // namespace QmlJsDebugClient
+} // namespace QmlDebug
 
 #include <qpacketprotocol.moc>
diff --git a/src/libs/qmljsdebugclient/qpacketprotocol.h b/src/libs/qmldebug/qpacketprotocol.h
index 4225efccdb..12c8572482 100644
--- a/src/libs/qmljsdebugclient/qpacketprotocol.h
+++ b/src/libs/qmldebug/qpacketprotocol.h
@@ -40,7 +40,7 @@ class QIODevice;
 class QBuffer;
 QT_END_NAMESPACE
 
-namespace QmlJsDebugClient {
+namespace QmlDebug {
 
 class QPacket;
 class QPacketAutoSend;
@@ -109,6 +109,6 @@ private:
     QPacketProtocol *p;
 };
 
-} // QmlJsDebugClient
+} // QmlDebug
 
 #endif
diff --git a/src/libs/qmljsdebugclient/qv8profilerclient.cpp b/src/libs/qmldebug/qv8profilerclient.cpp
index 7853efcdb3..f988d7d140 100644
--- a/src/libs/qmljsdebugclient/qv8profilerclient.cpp
+++ b/src/libs/qmldebug/qv8profilerclient.cpp
@@ -32,7 +32,7 @@
 
 #include "qv8profilerclient.h"
 
-namespace QmlJsDebugClient {
+namespace QmlDebug {
 
 class QV8ProfilerClientPrivate {
 public:
@@ -48,9 +48,9 @@ public:
     bool recording;
 };
 
-} // namespace QmlJsDebugClient
+} // namespace QmlDebug
 
-using namespace QmlJsDebugClient;
+using namespace QmlDebug;
 
 void QV8ProfilerClientPrivate::sendRecordingStatus()
 {
@@ -69,8 +69,8 @@ void QV8ProfilerClientPrivate::sendRecordingStatus()
     q->sendMessage(ba);
 }
 
-QV8ProfilerClient::QV8ProfilerClient(QDeclarativeDebugConnection *client)
-    : QDeclarativeDebugClient(QLatin1String("V8Profiler"), client)
+QV8ProfilerClient::QV8ProfilerClient(QmlDebugConnection *client)
+    : QmlDebugClient(QLatin1String("V8Profiler"), client)
     , d(new QV8ProfilerClientPrivate(this))
 {
 }
diff --git a/src/libs/qmljsdebugclient/qv8profilerclient.h b/src/libs/qmldebug/qv8profilerclient.h
index 48d191a458..5e9cd6d6ab 100644
--- a/src/libs/qmljsdebugclient/qv8profilerclient.h
+++ b/src/libs/qmldebug/qv8profilerclient.h
@@ -33,16 +33,16 @@
 #ifndef QV8PROFILERCLIENT_H
 #define QV8PROFILERCLIENT_H
 
-#include "qdeclarativedebugclient.h"
+#include "qmldebugclient.h"
 #include "qmlprofilereventtypes.h"
-#include "qmljsdebugclient_global.h"
+#include "qmldebug_global.h"
 
 #include <QStack>
 #include <QStringList>
 
-namespace QmlJsDebugClient {
+namespace QmlDebug {
 
-class QMLJSDEBUGCLIENT_EXPORT QV8ProfilerClient : public QDeclarativeDebugClient
+class QMLDEBUG_EXPORT QV8ProfilerClient : public QmlDebugClient
 {
     Q_OBJECT
     Q_PROPERTY(bool enabled READ isEnabled NOTIFY enabledChanged)
@@ -59,7 +59,7 @@ public:
         V8MaximumMessage
     };
 
-    QV8ProfilerClient(QDeclarativeDebugConnection *client);
+    QV8ProfilerClient(QmlDebugConnection *client);
     ~QV8ProfilerClient();
 
     bool isEnabled() const;
@@ -91,6 +91,6 @@ private:
     class QV8ProfilerClientPrivate *d;
 };
 
-} // namespace QmlJsDebugClient
+} // namespace QmlDebug
 
 #endif // QV8PROFILERCLIENT_H
diff --git a/src/libs/qmljsdebugclient/qmljsdebugclient-lib.pri b/src/libs/qmljsdebugclient/qmljsdebugclient-lib.pri
deleted file mode 100644
index ccc71ec9c8..0000000000
--- a/src/libs/qmljsdebugclient/qmljsdebugclient-lib.pri
+++ /dev/null
@@ -1,37 +0,0 @@
-contains(CONFIG, dll) {
-    DEFINES += QMLJSDEBUGCLIENT_LIB
-} else {
-    DEFINES += QMLJSDEBUGCLIENT_STATIC_LIB
-}
-
-INCLUDEPATH += $$PWD/..
-
-HEADERS += \
-    $$PWD/qmlprofilereventlocation.h \
-    $$PWD/qdeclarativedebugclient.h \
-    $$PWD/qmlenginedebugclient.h \
-    $$PWD/qdeclarativeengineclient.h \
-    $$PWD/qdeclarativeoutputparser.h \
-    $$PWD/qmljsdebugclient_global.h \
-    $$PWD/qmlprofilereventtypes.h \
-    $$PWD/qmlprofilertraceclient.h \
-    $$PWD/qpacketprotocol.h \
-    $$PWD/qv8profilerclient.h \
-    $$PWD/qmljsdebugclientconstants.h \
-    $$PWD/qdebugmessageclient.h \
-    $$PWD/qmldebuggerclient.h
-
-SOURCES += \
-    $$PWD/qdeclarativedebugclient.cpp \
-    $$PWD/qmlenginedebugclient.cpp \
-    $$PWD/qdeclarativeoutputparser.cpp \
-    $$PWD/qmlprofilertraceclient.cpp \
-    $$PWD/qpacketprotocol.cpp \
-    $$PWD/qv8profilerclient.cpp \
-    $$PWD/qdebugmessageclient.cpp \
-    $$PWD/qmldebuggerclient.cpp
-
-OTHER_FILES += \
-    $$PWD/qmljsdebugclient.pri \
-    $$PWD/qmljsdebugclient-lib.pri
-
diff --git a/src/libs/qmljsdebugclient/qmljsdebugclient.pri b/src/libs/qmljsdebugclient/qmljsdebugclient.pri
deleted file mode 100644
index 3fd8a3e1f6..0000000000
--- a/src/libs/qmljsdebugclient/qmljsdebugclient.pri
+++ /dev/null
@@ -1,3 +0,0 @@
-include(../symbianutils/symbianutils.pri)
-
-LIBS *= -l$$qtLibraryName(QmlJSDebugClient)
diff --git a/src/libs/qmljsdebugclient/qmljsdebugclient.pro b/src/libs/qmljsdebugclient/qmljsdebugclient.pro
deleted file mode 100644
index 893ef89d48..0000000000
--- a/src/libs/qmljsdebugclient/qmljsdebugclient.pro
+++ /dev/null
@@ -1,13 +0,0 @@
-TEMPLATE = lib
-TARGET = QmlJSDebugClient
-QT += network
-DEFINES += QMLJSDEBUGCLIENT_LIBRARY
-
-include(../../qtcreatorlibrary.pri)
-include(../symbianutils/symbianutils.pri)
-include(qmljsdebugclient-lib.pri)
-
-OTHER_FILES += \
-    qmljsdebugclient.pri \
-    qmljsdebugclient-lib.pri
-
diff --git a/src/plugins/debugger/debugger.qbs b/src/plugins/debugger/debugger.qbs
index 0a4d90c001..9b54e1d300 100644
--- a/src/plugins/debugger/debugger.qbs
+++ b/src/plugins/debugger/debugger.qbs
@@ -14,7 +14,7 @@ QtcPlugin {
     Depends { name: "CPlusPlus" }
     Depends { name: "symbianutils" }
     Depends { name: "QmlJS" }
-    Depends { name: "QmlJSDebugClient" }
+    Depends { name: "QmlDebug" }
 
     Depends { name: "cpp" }
     cpp.defines: ["DEBUGGER_LIBRARY"]
@@ -230,7 +230,7 @@ QtcPlugin {
         "pdb/pdbengine.h",
         "qml/qmlengine.h",
         "qml/qmladapter.h",
-        "qml/qmldebuggerclient.h",
+        "qml/baseqmldebuggerclient.h",
         "qml/qmljsprivateapi.h",
         "qml/qmlcppengine.h",
         "qml/qscriptdebuggerclient.h",
@@ -239,7 +239,7 @@ QtcPlugin {
         "qml/qmlv8debuggerclientconstants.h",
         "qml/qmlengine.cpp",
         "qml/qmladapter.cpp",
-        "qml/qmldebuggerclient.cpp",
+        "qml/baseqmldebuggerclient.cpp",
         "qml/qmlcppengine.cpp",
         "qml/qscriptdebuggerclient.cpp",
         "qml/qmlv8debuggerclient.cpp",
diff --git a/src/plugins/debugger/qml/qmldebuggerclient.cpp b/src/plugins/debugger/qml/baseqmldebuggerclient.cpp
index 2be56b7c3e..4bcd9e1b3a 100644
--- a/src/plugins/debugger/qml/qmldebuggerclient.cpp
+++ b/src/plugins/debugger/qml/baseqmldebuggerclient.cpp
@@ -29,7 +29,8 @@
 ** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
-#include "qmldebuggerclient.h"
+
+#include "baseqmldebuggerclient.h"
 #include "breakpoint.h"
 
 #include <extensionsystem/pluginmanager.h>
@@ -38,58 +39,58 @@
 namespace Debugger {
 namespace Internal {
 
-class QmlDebuggerClientPrivate
+class BaseQmlDebuggerClientPrivate
 {
 public:
     QList<QByteArray> sendBuffer;
 };
 
-QmlDebuggerClient::QmlDebuggerClient(QmlJsDebugClient::QDeclarativeDebugConnection* client, QLatin1String clientName)
-    : QDeclarativeDebugClient(clientName, client),
-      d(new QmlDebuggerClientPrivate())
+BaseQmlDebuggerClient::BaseQmlDebuggerClient(QmlDebug::QmlDebugConnection* client, QLatin1String clientName)
+    : QmlDebugClient(clientName, client),
+      d(new BaseQmlDebuggerClientPrivate())
 {
 }
 
-QmlDebuggerClient::~QmlDebuggerClient()
+BaseQmlDebuggerClient::~BaseQmlDebuggerClient()
 {
     delete d;
 }
 
-bool QmlDebuggerClient::acceptsBreakpoint(const BreakpointModelId &/*id*/)
+bool BaseQmlDebuggerClient::acceptsBreakpoint(const BreakpointModelId &/*id*/)
 {
     return false;
 }
 
-void QmlDebuggerClient::statusChanged(Status status)
+void BaseQmlDebuggerClient::statusChanged(Status status)
 {
     emit newStatus(status);
 }
 
-void QmlDebuggerClient::sendMessage(const QByteArray &msg)
+void BaseQmlDebuggerClient::sendMessage(const QByteArray &msg)
 {
     if (status() == Enabled) {
-        QDeclarativeDebugClient::sendMessage(msg);
+        QmlDebugClient::sendMessage(msg);
     } else {
         d->sendBuffer.append(msg);
     }
 }
 
-void QmlDebuggerClient::flushSendBuffer()
+void BaseQmlDebuggerClient::flushSendBuffer()
 {
-    QTC_ASSERT(status() == QDeclarativeDebugClient::Enabled, return);
+    QTC_ASSERT(status() == QmlDebugClient::Enabled, return);
     foreach (const QByteArray &msg, d->sendBuffer)
-       QDeclarativeDebugClient::sendMessage(msg);
+       QmlDebugClient::sendMessage(msg);
     d->sendBuffer.clear();
 }
 
 //TODO:: remove this method
-QList<QByteArray> QmlDebuggerClient::cachedMessages()
+QList<QByteArray> BaseQmlDebuggerClient::cachedMessages()
 {
     return d->sendBuffer;
 }
 
 //TODO:: remove this method
-void QmlDebuggerClient::clearCachedMessages()
+void BaseQmlDebuggerClient::clearCachedMessages()
 {
     d->sendBuffer.clear();
 }
diff --git a/src/plugins/debugger/qml/qmldebuggerclient.h b/src/plugins/debugger/qml/baseqmldebuggerclient.h
index f6ba4b9c2b..af3e228721 100644
--- a/src/plugins/debugger/qml/qmldebuggerclient.h
+++ b/src/plugins/debugger/qml/baseqmldebuggerclient.h
@@ -30,8 +30,8 @@
 **
 **************************************************************************/
 
-#ifndef QMLDEBUGGERCLIENT_H
-#define QMLDEBUGGERCLIENT_H
+#ifndef BASEQMLDEBUGGERCLIENT_H
+#define BASEQMLDEBUGGERCLIENT_H
 
 #include "qmljsprivateapi.h"
 #include "debuggerengine.h"
@@ -43,15 +43,15 @@ class WatchData;
 class BreakHandler;
 class BreakpointModelId;
 class QmlEngine;
-class QmlDebuggerClientPrivate;
+class BaseQmlDebuggerClientPrivate;
 
-class QmlDebuggerClient : public QDeclarativeDebugClient
+class BaseQmlDebuggerClient : public QmlDebugClient
 {
     Q_OBJECT
 
 public:
-    QmlDebuggerClient(QmlJsDebugClient::QDeclarativeDebugConnection* client, QLatin1String clientName);
-    virtual ~QmlDebuggerClient();
+    BaseQmlDebuggerClient(QmlDebug::QmlDebugConnection* client, QLatin1String clientName);
+    virtual ~BaseQmlDebuggerClient();
 
     virtual void startSession() = 0;
     virtual void endSession() = 0;
@@ -93,7 +93,7 @@ public:
     void flushSendBuffer();
 
 signals:
-    void newStatus(QDeclarativeDebugClient::Status status);
+    void newStatus(QmlDebugClient::Status status);
 
 protected:
     virtual void statusChanged(Status status);
@@ -103,11 +103,11 @@ protected:
     void clearCachedMessages();
 
 private:
-    QmlDebuggerClientPrivate *d;
-    friend class QmlDebuggerClientPrivate;
+    BaseQmlDebuggerClientPrivate *d;
+    friend class BaseQmlDebuggerClientPrivate;
 };
 
 } // Internal
 } // Debugger
 
-#endif // QMLDEBUGGERCLIENT_H
+#endif // BASEQMLDEBUGGERCLIENT_H
diff --git a/src/plugins/debugger/qml/qml.pri b/src/plugins/debugger/qml/qml.pri
index 5f458b085c..55fe9de749 100644
--- a/src/plugins/debugger/qml/qml.pri
+++ b/src/plugins/debugger/qml/qml.pri
@@ -1,9 +1,9 @@
-include($$PWD/../../../libs/qmljsdebugclient/qmljsdebugclient.pri)
+include($$PWD/../../../libs/qmldebug/qmldebug.pri)
 
 HEADERS += \
     $$PWD/qmlengine.h \
     $$PWD/qmladapter.h \
-    $$PWD/qmldebuggerclient.h \
+    $$PWD/baseqmldebuggerclient.h \
     $$PWD/qmljsprivateapi.h \
     $$PWD/qmlcppengine.h \
     $$PWD/qscriptdebuggerclient.h \
@@ -14,7 +14,7 @@ HEADERS += \
 SOURCES += \
     $$PWD/qmlengine.cpp \
     $$PWD/qmladapter.cpp \
-    $$PWD/qmldebuggerclient.cpp \
+    $$PWD/baseqmldebuggerclient.cpp \
     $$PWD/qmlcppengine.cpp \
     $$PWD/qscriptdebuggerclient.cpp \
     $$PWD/qmlv8debuggerclient.cpp \
diff --git a/src/plugins/debugger/qml/qmladapter.cpp b/src/plugins/debugger/qml/qmladapter.cpp
index 184f648af4..4ac699f792 100644
--- a/src/plugins/debugger/qml/qmladapter.cpp
+++ b/src/plugins/debugger/qml/qmladapter.cpp
@@ -41,7 +41,7 @@
 #include <extensionsystem/pluginmanager.h>
 #include <utils/qtcassert.h>
 
-#include <qmljsdebugclient/qdebugmessageclient.h>
+#include <qmldebug/qdebugmessageclient.h>
 
 #include <QTimer>
 #include <QDebug>
@@ -66,14 +66,14 @@ public:
     }
 
     QWeakPointer<DebuggerEngine> m_engine;
-    QmlDebuggerClient *m_qmlClient;
-    QmlJsDebugClient::QmlEngineDebugClient *m_engineDebugClient;
+    BaseQmlDebuggerClient *m_qmlClient;
+    QmlDebug::BaseEngineDebugClient *m_engineDebugClient;
     QTimer m_connectionTimer;
-    QDeclarativeDebugConnection *m_conn;
-    QHash<QString, QmlDebuggerClient*> debugClients;
+    QmlDebugConnection *m_conn;
+    QHash<QString, BaseQmlDebuggerClient*> debugClients;
     int m_currentSelectedDebugId;
     QString m_currentSelectedDebugName;
-    QmlJsDebugClient::QDebugMessageClient *m_msgClient;
+    QmlDebug::QDebugMessageClient *m_msgClient;
 };
 
 } // namespace Internal
@@ -82,7 +82,7 @@ QmlAdapter::QmlAdapter(DebuggerEngine *engine, QObject *parent)
     : QObject(parent), d(new Internal::QmlAdapterPrivate(engine))
 {
     connect(&d->m_connectionTimer, SIGNAL(timeout()), SLOT(checkConnectionState()));
-    d->m_conn = new QDeclarativeDebugConnection(this);
+    d->m_conn = new QmlDebugConnection(this);
     connect(d->m_conn, SIGNAL(stateChanged(QAbstractSocket::SocketState)),
             SLOT(connectionStateChanged()));
     connect(d->m_conn, SIGNAL(error(QAbstractSocket::SocketError)),
@@ -93,9 +93,9 @@ QmlAdapter::QmlAdapter(DebuggerEngine *engine, QObject *parent)
     pluginManager->addObject(this);
 
     createDebuggerClients();
-    d->m_msgClient = new QmlJsDebugClient::QDebugMessageClient(d->m_conn);
-    connect(d->m_msgClient, SIGNAL(newStatus(QDeclarativeDebugClient::Status)),
-            this, SLOT(clientStatusChanged(QDeclarativeDebugClient::Status)));
+    d->m_msgClient = new QmlDebug::QDebugMessageClient(d->m_conn);
+    connect(d->m_msgClient, SIGNAL(newStatus(QmlDebugClient::Status)),
+            this, SLOT(clientStatusChanged(QmlDebugClient::Status)));
 }
 
 QmlAdapter::~QmlAdapter()
@@ -160,11 +160,11 @@ void QmlAdapter::connectionErrorOccurred(QAbstractSocket::SocketError socketErro
     }
 }
 
-void QmlAdapter::clientStatusChanged(QDeclarativeDebugClient::Status status)
+void QmlAdapter::clientStatusChanged(QmlDebugClient::Status status)
 {
     QString serviceName;
     float version = 0;
-    if (QDeclarativeDebugClient *client = qobject_cast<QDeclarativeDebugClient*>(sender())) {
+    if (QmlDebugClient *client = qobject_cast<QmlDebugClient*>(sender())) {
         serviceName = client->name();
         version = client->serviceVersion();
     }
@@ -172,14 +172,14 @@ void QmlAdapter::clientStatusChanged(QDeclarativeDebugClient::Status status)
     logServiceStatusChange(serviceName, version, status);
 }
 
-void QmlAdapter::debugClientStatusChanged(QDeclarativeDebugClient::Status status)
+void QmlAdapter::debugClientStatusChanged(QmlDebugClient::Status status)
 {
-    if (status != QDeclarativeDebugClient::Enabled)
+    if (status != QmlDebugClient::Enabled)
         return;
-    QDeclarativeDebugClient *client = qobject_cast<QDeclarativeDebugClient*>(sender());
+    QmlDebugClient *client = qobject_cast<QmlDebugClient*>(sender());
     QTC_ASSERT(client, return);
 
-    d->m_qmlClient =  qobject_cast<Internal::QmlDebuggerClient *>(client);
+    d->m_qmlClient =  qobject_cast<Internal::BaseQmlDebuggerClient *>(client);
     d->m_qmlClient->startSession();
 }
 
@@ -230,16 +230,16 @@ void QmlAdapter::createDebuggerClients()
 {
 
     Internal::QScriptDebuggerClient *client1 = new Internal::QScriptDebuggerClient(d->m_conn);
-    connect(client1, SIGNAL(newStatus(QDeclarativeDebugClient::Status)),
-            this, SLOT(clientStatusChanged(QDeclarativeDebugClient::Status)));
-    connect(client1, SIGNAL(newStatus(QDeclarativeDebugClient::Status)),
-            this, SLOT(debugClientStatusChanged(QDeclarativeDebugClient::Status)));
+    connect(client1, SIGNAL(newStatus(QmlDebugClient::Status)),
+            this, SLOT(clientStatusChanged(QmlDebugClient::Status)));
+    connect(client1, SIGNAL(newStatus(QmlDebugClient::Status)),
+            this, SLOT(debugClientStatusChanged(QmlDebugClient::Status)));
 
     Internal::QmlV8DebuggerClient *client2 = new Internal::QmlV8DebuggerClient(d->m_conn);
-    connect(client2, SIGNAL(newStatus(QDeclarativeDebugClient::Status)),
-            this, SLOT(clientStatusChanged(QDeclarativeDebugClient::Status)));
-    connect(client2, SIGNAL(newStatus(QDeclarativeDebugClient::Status)),
-            this, SLOT(debugClientStatusChanged(QDeclarativeDebugClient::Status)));
+    connect(client2, SIGNAL(newStatus(QmlDebugClient::Status)),
+            this, SLOT(clientStatusChanged(QmlDebugClient::Status)));
+    connect(client2, SIGNAL(newStatus(QmlDebugClient::Status)),
+            this, SLOT(debugClientStatusChanged(QmlDebugClient::Status)));
 
     d->debugClients.insert(client1->name(),client1);
     d->debugClients.insert(client2->name(),client2);
@@ -256,7 +256,7 @@ bool QmlAdapter::isConnected() const
     return d->m_conn && d->m_qmlClient && d->m_conn->state() == QAbstractSocket::ConnectedState;
 }
 
-QDeclarativeDebugConnection *QmlAdapter::connection() const
+QmlDebugConnection *QmlAdapter::connection() const
 {
     return d->m_conn;
 }
@@ -297,22 +297,22 @@ bool QmlAdapter::disableJsDebugging(bool block)
     return isBlocked;
 }
 
-Internal::QmlDebuggerClient *QmlAdapter::activeDebuggerClient()
+Internal::BaseQmlDebuggerClient *QmlAdapter::activeDebuggerClient()
 {
     return d->m_qmlClient;
 }
 
-QHash<QString, Internal::QmlDebuggerClient*> QmlAdapter::debuggerClients()
+QHash<QString, Internal::BaseQmlDebuggerClient*> QmlAdapter::debuggerClients()
 {
     return d->debugClients;
 }
 
-QmlJsDebugClient::QmlEngineDebugClient *QmlAdapter::engineDebugClient() const
+QmlDebug::BaseEngineDebugClient *QmlAdapter::engineDebugClient() const
 {
     return d->m_engineDebugClient;
 }
 
-void QmlAdapter::setEngineDebugClient(QmlJsDebugClient::QmlEngineDebugClient *client)
+void QmlAdapter::setEngineDebugClient(QmlDebug::BaseEngineDebugClient *client)
 {
     Internal::QmlEngine *engine =
             qobject_cast<Internal::QmlEngine *>(d->m_engine.data());
@@ -327,7 +327,7 @@ void QmlAdapter::setEngineDebugClient(QmlJsDebugClient::QmlEngineDebugClient *cl
                 SLOT(expressionEvaluated(quint32,QVariant)));
 }
 
-QmlJsDebugClient::QDebugMessageClient *QmlAdapter::messageClient() const
+QmlDebug::QDebugMessageClient *QmlAdapter::messageClient() const
 {
     return d->m_msgClient;
 }
@@ -350,21 +350,21 @@ void QmlAdapter::setCurrentSelectedDebugInfo(int currentDebugId, const QString &
 }
 
 void QmlAdapter::logServiceStatusChange(const QString &service, float version,
-                                        QDeclarativeDebugClient::Status newStatus)
+                                        QmlDebugClient::Status newStatus)
 {
     switch (newStatus) {
-    case QDeclarativeDebugClient::Unavailable: {
+    case QmlDebugClient::Unavailable: {
         showConnectionStatusMessage(tr("Status of '%1' Version: %2 changed to 'unavailable'.").
                                     arg(service).arg(QString::number(version)));
         break;
     }
-    case QDeclarativeDebugClient::Enabled: {
+    case QmlDebugClient::Enabled: {
         showConnectionStatusMessage(tr("Status of '%1' Version: %2 changed to 'enabled'.").
                                     arg(service).arg(QString::number(version)));
         break;
     }
 
-    case QDeclarativeDebugClient::NotConnected: {
+    case QmlDebugClient::NotConnected: {
         showConnectionStatusMessage(tr("Status of '%1' Version: %2 changed to 'not connected'.").
                                     arg(service).arg(QString::number(version)));
         break;
diff --git a/src/plugins/debugger/qml/qmladapter.h b/src/plugins/debugger/qml/qmladapter.h
index 8df5593d8b..de92eab88e 100644
--- a/src/plugins/debugger/qml/qmladapter.h
+++ b/src/plugins/debugger/qml/qmladapter.h
@@ -30,18 +30,18 @@
 **
 **************************************************************************/
 
-#ifndef DEBGUGGER_QMLADAPTER_H
-#define DEBGUGGER_QMLADAPTER_H
+#ifndef QMLADAPTER_H
+#define QMLADAPTER_H
 
 #include "debugger_global.h"
-#include "qmldebuggerclient.h"
+#include "qmljsprivateapi.h"
 
 #include <QObject>
 #include <QAbstractSocket>
 
-namespace QmlJsDebugClient {
-class QmlEngineDebugClient;
-class QDeclarativeDebugConnection;
+namespace QmlDebug {
+class BaseEngineDebugClient;
+class QmlDebugConnection;
 class QDebugMessageClient;
 }
 
@@ -50,7 +50,7 @@ namespace Debugger {
 class DebuggerEngine;
 
 namespace Internal {
-class QmlDebuggerClient;
+class BaseQmlDebuggerClient;
 class QmlAdapterPrivate;
 } // namespace Internal
 
@@ -68,25 +68,25 @@ public:
 
     bool isConnected() const;
 
-    QmlJsDebugClient::QDeclarativeDebugConnection *connection() const;
+    QmlDebug::QmlDebugConnection *connection() const;
     DebuggerEngine *debuggerEngine() const;
 
     bool disableJsDebugging(bool block);
 
-    Internal::QmlDebuggerClient *activeDebuggerClient();
-    QHash<QString, Internal::QmlDebuggerClient*> debuggerClients();
+    Internal::BaseQmlDebuggerClient *activeDebuggerClient();
+    QHash<QString, Internal::BaseQmlDebuggerClient*> debuggerClients();
 
-    QmlJsDebugClient::QmlEngineDebugClient *engineDebugClient() const;
-    void setEngineDebugClient(QmlJsDebugClient::QmlEngineDebugClient *client);
+    QmlDebug::BaseEngineDebugClient *engineDebugClient() const;
+    void setEngineDebugClient(QmlDebug::BaseEngineDebugClient *client);
 
-    QDebugMessageClient *messageClient() const;
+    QmlDebug::QDebugMessageClient *messageClient() const;
 
     int currentSelectedDebugId() const;
     QString currentSelectedDisplayName() const;
     void setCurrentSelectedDebugInfo(int debugId, const QString &displayName = QString());
 
 public slots:
-    void logServiceStatusChange(const QString &service, float version, QDeclarativeDebugClient::Status newStatus);
+    void logServiceStatusChange(const QString &service, float version, QmlDebugClient::Status newStatus);
     void logServiceActivity(const QString &service, const QString &logMessage);
 
 signals:
@@ -99,8 +99,8 @@ signals:
 
 private slots:
     void connectionErrorOccurred(QAbstractSocket::SocketError socketError);
-    void clientStatusChanged(QDeclarativeDebugClient::Status status);
-    void debugClientStatusChanged(QDeclarativeDebugClient::Status status);
+    void clientStatusChanged(QmlDebugClient::Status status);
+    void debugClientStatusChanged(QmlDebugClient::Status status);
     void connectionStateChanged();
     void checkConnectionState();
 
@@ -115,4 +115,4 @@ private:
 
 } // namespace Debugger
 
-#endif // DEBGUGGER_QMLADAPTER_H
+#endif // QMLADAPTER_H
diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp
index ae7ec26cdf..d696ef9938 100644
--- a/src/plugins/debugger/qml/qmlengine.cpp
+++ b/src/plugins/debugger/qml/qmlengine.cpp
@@ -33,6 +33,7 @@
 #include "qmlengine.h"
 #include "qmladapter.h"
 #include "interactiveinterpreter.h"
+#include "baseqmldebuggerclient.h"
 
 #include "debuggerstartparameters.h"
 #include "debuggeractions.h"
@@ -56,8 +57,8 @@
 
 #include <extensionsystem/pluginmanager.h>
 #include <projectexplorer/applicationlauncher.h>
-#include <qmljsdebugclient/qdeclarativeoutputparser.h>
-#include <qmljsdebugclient/qmlenginedebugclient.h>
+#include <qmldebug/qmloutputparser.h>
+#include <qmldebug/baseenginedebugclient.h>
 #include <qmljseditor/qmljseditorconstants.h>
 #include <qmljs/parser/qmljsast_p.h>
 #include <qmljs/qmljsmodelmanagerinterface.h>
@@ -114,7 +115,7 @@ private:
     QmlAdapter m_adapter;
     ApplicationLauncher m_applicationLauncher;
     QTimer m_noDebugOutputTimer;
-    QmlJsDebugClient::QDeclarativeOutputParser m_outputParser;
+    QmlDebug::QmlOutputParser m_outputParser;
     QHash<QString, QTextDocument*> m_sourceDocuments;
     QHash<QString, QWeakPointer<TextEditor::ITextEditor> > m_sourceEditors;
     InteractiveInterpreter m_interpreter;
@@ -329,9 +330,9 @@ QmlEngine::QmlEngine(const DebuggerStartParameters &startParameters,
             SLOT(updateCurrentContext()));
     connect(d->m_adapter.messageClient(),
             SIGNAL(message(QtMsgType,QString,
-                           QmlJsDebugClient::QDebugContextInfo)),
+                           QmlDebug::QDebugContextInfo)),
             SLOT(appendDebugOutput(QtMsgType,QString,
-                                   QmlJsDebugClient::QDebugContextInfo)));
+                                   QmlDebug::QDebugContextInfo)));
 
     connect(&d->m_applicationLauncher,
         SIGNAL(processExited(int)),
@@ -836,7 +837,7 @@ void QmlEngine::insertBreakpoint(BreakpointModelId id)
     if (d->m_adapter.activeDebuggerClient()) {
         d->m_adapter.activeDebuggerClient()->insertBreakpoint(id, line, column);
     } else {
-        foreach (QmlDebuggerClient *client, d->m_adapter.debuggerClients()) {
+        foreach (BaseQmlDebuggerClient *client, d->m_adapter.debuggerClients()) {
             client->insertBreakpoint(id, line, column);
         }
     }
@@ -867,7 +868,7 @@ void QmlEngine::removeBreakpoint(BreakpointModelId id)
     if (d->m_adapter.activeDebuggerClient()) {
         d->m_adapter.activeDebuggerClient()->removeBreakpoint(id);
     } else {
-        foreach (QmlDebuggerClient *client, d->m_adapter.debuggerClients()) {
+        foreach (BaseQmlDebuggerClient *client, d->m_adapter.debuggerClients()) {
             client->removeBreakpoint(id);
         }
     }
@@ -887,7 +888,7 @@ void QmlEngine::changeBreakpoint(BreakpointModelId id)
     if (d->m_adapter.activeDebuggerClient()) {
         d->m_adapter.activeDebuggerClient()->changeBreakpoint(id);
     } else {
-        foreach (QmlDebuggerClient *client, d->m_adapter.debuggerClients()) {
+        foreach (BaseQmlDebuggerClient *client, d->m_adapter.debuggerClients()) {
             client->changeBreakpoint(id);
         }
     }
@@ -943,7 +944,7 @@ void QmlEngine::attemptBreakpointSynchronization()
     if (d->m_adapter.activeDebuggerClient()) {
         d->m_adapter.activeDebuggerClient()->synchronizeBreakpoints();
     } else {
-        foreach (QmlDebuggerClient *client, d->m_adapter.debuggerClients()) {
+        foreach (BaseQmlDebuggerClient *client, d->m_adapter.debuggerClients()) {
             client->synchronizeBreakpoints();
         }
     }
@@ -1051,7 +1052,7 @@ void QmlEngine::synchronizeWatchers()
     if (d->m_adapter.activeDebuggerClient()) {
         d->m_adapter.activeDebuggerClient()->synchronizeWatchers(watchedExpressions);
     } else {
-        foreach (QmlDebuggerClient *client, d->m_adapter.debuggerClients())
+        foreach (BaseQmlDebuggerClient *client, d->m_adapter.debuggerClients())
             client->synchronizeWatchers(watchedExpressions);
     }
 }
@@ -1116,7 +1117,7 @@ void QmlEngine::updateCurrentContext()
 }
 
 void QmlEngine::appendDebugOutput(QtMsgType type, const QString &message,
-                                  const QmlJsDebugClient::QDebugContextInfo &info)
+                                  const QmlDebug::QDebugContextInfo &info)
 {
     QtMessageLogHandler::ItemType itemType;
     switch (type) {
@@ -1162,7 +1163,7 @@ bool QmlEngine::evaluateScriptExpression(const QString& expression)
                 //is sent to V8DebugService. In all other cases, the
                 //expression is evaluated by QDeclarativeEngine.
                 if (state() != InferiorStopOk) {
-                    QmlEngineDebugClient *engineDebug =
+                    BaseEngineDebugClient *engineDebug =
                             d->m_adapter.engineDebugClient();
 
                     int id = d->m_adapter.currentSelectedDebugId();
diff --git a/src/plugins/debugger/qml/qmlengine.h b/src/plugins/debugger/qml/qmlengine.h
index 992c1b2065..7994379332 100644
--- a/src/plugins/debugger/qml/qmlengine.h
+++ b/src/plugins/debugger/qml/qmlengine.h
@@ -34,7 +34,7 @@
 #define DEBUGGER_QMLENGINE_H
 
 #include "debuggerengine.h"
-#include <qmljsdebugclient/qdebugmessageclient.h>
+#include <qmldebug/qdebugmessageclient.h>
 #include <utils/outputformat.h>
 #include <qmljs/qmljsdocument.h>
 
@@ -101,7 +101,7 @@ private slots:
     void errorMessageBoxFinished(int result);
     void updateCurrentContext();
     void appendDebugOutput(QtMsgType type, const QString &message,
-                           const QmlJsDebugClient::QDebugContextInfo &info);
+                           const QmlDebug::QDebugContextInfo &info);
 
 private:
     // DebuggerEngine implementation.
diff --git a/src/plugins/debugger/qml/qmljsprivateapi.h b/src/plugins/debugger/qml/qmljsprivateapi.h
index 003938c548..cf865f2e40 100644
--- a/src/plugins/debugger/qml/qmljsprivateapi.h
+++ b/src/plugins/debugger/qml/qmljsprivateapi.h
@@ -32,11 +32,11 @@
 #ifndef QMLJSPRIVATEAPI_H
 #define QMLJSPRIVATEAPI_H
 
-#include <qmljsdebugclient/qmlenginedebugclient.h>
-#include <qmljsdebugclient/qdeclarativedebugclient.h>
-#include <qmljsdebugclient/qdeclarativeengineclient.h>
-#include <qmljsdebugclient/qmldebuggerclient.h>
+#include <qmldebug/baseenginedebugclient.h>
+#include <qmldebug/qmldebugclient.h>
+#include <qmldebug/declarativeenginedebugclient.h>
+#include <qmldebug/qmlenginedebugclient.h>
 
-using namespace QmlJsDebugClient;
+using namespace QmlDebug;
 
 #endif // QMLJSPRIVATEAPI_H
diff --git a/src/plugins/debugger/qml/qmlv8debuggerclient.cpp b/src/plugins/debugger/qml/qmlv8debuggerclient.cpp
index ae72e70f43..94fffd41a6 100644
--- a/src/plugins/debugger/qml/qmlv8debuggerclient.cpp
+++ b/src/plugins/debugger/qml/qmlv8debuggerclient.cpp
@@ -1011,8 +1011,8 @@ QtMessageLogItem *QmlV8DebuggerClientPrivate::constructLogItemTree(
 //
 ///////////////////////////////////////////////////////////////////////
 
-QmlV8DebuggerClient::QmlV8DebuggerClient(QmlJsDebugClient::QDeclarativeDebugConnection *client)
-    : QmlDebuggerClient(client, QLatin1String("V8Debugger")),
+QmlV8DebuggerClient::QmlV8DebuggerClient(QmlDebug::QmlDebugConnection *client)
+    : BaseQmlDebuggerClient(client, QLatin1String("V8Debugger")),
       d(new QmlV8DebuggerClientPrivate(this))
 {
 }
diff --git a/src/plugins/debugger/qml/qmlv8debuggerclient.h b/src/plugins/debugger/qml/qmlv8debuggerclient.h
index f434f42f7c..8cb2c23601 100644
--- a/src/plugins/debugger/qml/qmlv8debuggerclient.h
+++ b/src/plugins/debugger/qml/qmlv8debuggerclient.h
@@ -33,7 +33,7 @@
 #ifndef QMLV8DEBUGGERCLIENT_H
 #define QMLV8DEBUGGERCLIENT_H
 
-#include "qmldebuggerclient.h"
+#include "baseqmldebuggerclient.h"
 #include "stackframe.h"
 #include "watchdata.h"
 
@@ -42,7 +42,7 @@ namespace Internal {
 
 class QmlV8DebuggerClientPrivate;
 
-class QmlV8DebuggerClient : public QmlDebuggerClient
+class QmlV8DebuggerClient : public BaseQmlDebuggerClient
 {
     Q_OBJECT
 
@@ -62,7 +62,7 @@ class QmlV8DebuggerClient : public QmlDebuggerClient
     };
 
 public:
-    explicit QmlV8DebuggerClient(QmlJsDebugClient::QDeclarativeDebugConnection *client);
+    explicit QmlV8DebuggerClient(QmlDebug::QmlDebugConnection *client);
     ~QmlV8DebuggerClient();
 
     void startSession();
diff --git a/src/plugins/debugger/qml/qscriptdebuggerclient.cpp b/src/plugins/debugger/qml/qscriptdebuggerclient.cpp
index 7fbde8d17f..e4fe415cdd 100644
--- a/src/plugins/debugger/qml/qscriptdebuggerclient.cpp
+++ b/src/plugins/debugger/qml/qscriptdebuggerclient.cpp
@@ -133,8 +133,8 @@ public:
     void logReceiveMessage(const QString &msg) const;
 };
 
-QScriptDebuggerClient::QScriptDebuggerClient(QmlJsDebugClient::QDeclarativeDebugConnection* client)
-    : QmlDebuggerClient(client, QLatin1String("JSDebugger")),
+QScriptDebuggerClient::QScriptDebuggerClient(QmlDebug::QmlDebugConnection* client)
+    : BaseQmlDebuggerClient(client, QLatin1String("JSDebugger")),
       d(new QScriptDebuggerClientPrivate(this))
 {
 }
diff --git a/src/plugins/debugger/qml/qscriptdebuggerclient.h b/src/plugins/debugger/qml/qscriptdebuggerclient.h
index 56dc289829..5df32c6810 100644
--- a/src/plugins/debugger/qml/qscriptdebuggerclient.h
+++ b/src/plugins/debugger/qml/qscriptdebuggerclient.h
@@ -33,7 +33,7 @@
 #ifndef QSCRIPTDEBUGGERCLIENT_H
 #define QSCRIPTDEBUGGERCLIENT_H
 
-#include "qmldebuggerclient.h"
+#include "baseqmldebuggerclient.h"
 #include "stackframe.h"
 #include "watchdata.h"
 #include "qmlengine.h"
@@ -43,12 +43,12 @@ namespace Internal {
 
 class QScriptDebuggerClientPrivate;
 
-class QScriptDebuggerClient : public QmlDebuggerClient
+class QScriptDebuggerClient : public BaseQmlDebuggerClient
 {
     Q_OBJECT
 
 public:
-    QScriptDebuggerClient(QmlJsDebugClient::QDeclarativeDebugConnection *client);
+    QScriptDebuggerClient(QmlDebug::QmlDebugConnection *client);
     ~QScriptDebuggerClient();
 
     void startSession();
diff --git a/src/plugins/qmljsinspector/qmljsclientproxy.cpp b/src/plugins/qmljsinspector/qmljsclientproxy.cpp
index 4a31772b56..84031a429f 100644
--- a/src/plugins/qmljsinspector/qmljsclientproxy.cpp
+++ b/src/plugins/qmljsinspector/qmljsclientproxy.cpp
@@ -32,10 +32,10 @@
 
 #include "qmljsclientproxy.h"
 #include "qmljsprivateapi.h"
-#include "qmljsinspectorclient.h"
+#include "qmltoolsclient.h"
 #include "qmljsinspector.h"
 
-#include <qmljsdebugclient/qmljsdebugclientconstants.h>
+#include <qmldebug/qmldebugconstants.h>
 #include <debugger/debuggerplugin.h>
 #include <debugger/debuggerrunner.h>
 #include <debugger/qml/qmlengine.h>
@@ -53,7 +53,7 @@ ClientProxy::ClientProxy(Debugger::QmlAdapter *adapter, QObject *parent)
     : QObject(parent)
     , m_adapter(adapter)
     , m_engineClient(0)
-    , m_inspectorClient(0)
+    , m_inspectorHelperClient(0)
     , m_engineQueryId(0)
     , m_contextQueryId(0)
     , m_isConnected(false)
@@ -69,57 +69,57 @@ ClientProxy::~ClientProxy()
 
 void ClientProxy::connectToServer()
 {
-    QmlEngineDebugClient *client1 = new QDeclarativeEngineClient(
+    DeclarativeEngineDebugCLient *client1 = new DeclarativeEngineDebugCLient(
                 m_adapter.data()->connection());
-    QmlEngineDebugClient *client2 = new QmlDebuggerClient(
+    QmlEngineDebugClient *client2 = new QmlEngineDebugClient(
                 m_adapter.data()->connection());
 
-    connect(client1, SIGNAL(newStatus(QDeclarativeDebugClient::Status)),
-            SLOT(clientStatusChanged(QDeclarativeDebugClient::Status)));
-    connect(client1, SIGNAL(newStatus(QDeclarativeDebugClient::Status)),
-            SLOT(engineClientStatusChanged(QDeclarativeDebugClient::Status)));
+    connect(client1, SIGNAL(newStatus(QmlDebugClient::Status)),
+            SLOT(clientStatusChanged(QmlDebugClient::Status)));
+    connect(client1, SIGNAL(newStatus(QmlDebugClient::Status)),
+            SLOT(engineClientStatusChanged(QmlDebugClient::Status)));
 
-    connect(client2, SIGNAL(newStatus(QDeclarativeDebugClient::Status)),
-            SLOT(clientStatusChanged(QDeclarativeDebugClient::Status)));
-    connect(client2, SIGNAL(newStatus(QDeclarativeDebugClient::Status)),
-            SLOT(engineClientStatusChanged(QDeclarativeDebugClient::Status)));
+    connect(client2, SIGNAL(newStatus(QmlDebugClient::Status)),
+            SLOT(clientStatusChanged(QmlDebugClient::Status)));
+    connect(client2, SIGNAL(newStatus(QmlDebugClient::Status)),
+            SLOT(engineClientStatusChanged(QmlDebugClient::Status)));
 
-    m_inspectorClient =
-            new QmlJSInspectorClient(m_adapter.data()->connection(), this);
+    m_inspectorHelperClient =
+            new QmlToolsClient(m_adapter.data()->connection(), this);
 
-    connect(m_inspectorClient,
-            SIGNAL(connectedStatusChanged(QDeclarativeDebugClient::Status)),
-            this, SLOT(clientStatusChanged(QDeclarativeDebugClient::Status)));
-    connect(m_inspectorClient, SIGNAL(currentObjectsChanged(QList<int>)),
+    connect(m_inspectorHelperClient,
+            SIGNAL(connectedStatusChanged(QmlDebugClient::Status)),
+            this, SLOT(clientStatusChanged(QmlDebugClient::Status)));
+    connect(m_inspectorHelperClient, SIGNAL(currentObjectsChanged(QList<int>)),
             SLOT(onCurrentObjectsChanged(QList<int>)));
-    connect(m_inspectorClient, SIGNAL(zoomToolActivated()),
+    connect(m_inspectorHelperClient, SIGNAL(zoomToolActivated()),
             SIGNAL(zoomToolActivated()));
-    connect(m_inspectorClient, SIGNAL(selectToolActivated()),
+    connect(m_inspectorHelperClient, SIGNAL(selectToolActivated()),
             SIGNAL(selectToolActivated()));
-    connect(m_inspectorClient, SIGNAL(selectMarqueeToolActivated()),
+    connect(m_inspectorHelperClient, SIGNAL(selectMarqueeToolActivated()),
             SIGNAL(selectMarqueeToolActivated()));
-    connect(m_inspectorClient, SIGNAL(animationSpeedChanged(qreal)),
+    connect(m_inspectorHelperClient, SIGNAL(animationSpeedChanged(qreal)),
             SIGNAL(animationSpeedChanged(qreal)));
-    connect(m_inspectorClient, SIGNAL(animationPausedChanged(bool)),
+    connect(m_inspectorHelperClient, SIGNAL(animationPausedChanged(bool)),
             SIGNAL(animationPausedChanged(bool)));
-    connect(m_inspectorClient, SIGNAL(designModeBehaviorChanged(bool)),
+    connect(m_inspectorHelperClient, SIGNAL(designModeBehaviorChanged(bool)),
             SIGNAL(designModeBehaviorChanged(bool)));
-    connect(m_inspectorClient, SIGNAL(showAppOnTopChanged(bool)),
+    connect(m_inspectorHelperClient, SIGNAL(showAppOnTopChanged(bool)),
             SIGNAL(showAppOnTopChanged(bool)));
-    connect(m_inspectorClient, SIGNAL(reloaded()), this,
+    connect(m_inspectorHelperClient, SIGNAL(reloaded()), this,
             SIGNAL(serverReloaded()));
-    connect(m_inspectorClient, SIGNAL(logActivity(QString,QString)),
+    connect(m_inspectorHelperClient, SIGNAL(logActivity(QString,QString)),
             m_adapter.data(), SLOT(logServiceActivity(QString,QString)));
 
     updateConnected();
 }
 
-void ClientProxy::clientStatusChanged(QDeclarativeDebugClient::Status status)
+void ClientProxy::clientStatusChanged(QmlDebugClient::Status status)
 {
     QString serviceName;
     float version = 0;
-    if (QDeclarativeDebugClient *client
-            = qobject_cast<QDeclarativeDebugClient*>(sender())) {
+    if (QmlDebugClient *client
+            = qobject_cast<QmlDebugClient*>(sender())) {
         serviceName = client->name();
         version = client->serviceVersion();
     }
@@ -130,16 +130,16 @@ void ClientProxy::clientStatusChanged(QDeclarativeDebugClient::Status status)
     updateConnected();
 }
 
-QDeclarativeDebugClient *ClientProxy::qmlDebugger() const
+QmlDebugClient *ClientProxy::inspectorClient() const
 {
     return m_engineClient;
 }
 
 void ClientProxy::engineClientStatusChanged(
-        QDeclarativeDebugClient::Status status)
+        QmlDebugClient::Status status)
 {
-    if (status == QDeclarativeDebugClient::Enabled) {
-        m_engineClient = qobject_cast<QmlEngineDebugClient *>(sender());
+    if (status == QmlDebugClient::Enabled) {
+        m_engineClient = qobject_cast<BaseEngineDebugClient*>(sender());
         connect(m_engineClient, SIGNAL(newObjects()), this, SLOT(newObjects()));
         connect(m_engineClient, SIGNAL(result(quint32,QVariant,QByteArray)),
                 SLOT(onResult(quint32,QVariant,QByteArray)));
@@ -217,7 +217,7 @@ void ClientProxy::setSelectedItemsByDebugId(const QList<int> &debugIds)
     if (!isConnected())
         return;
 
-    m_inspectorClient->setCurrentObjects(debugIds);
+    m_inspectorHelperClient->setCurrentObjects(debugIds);
 }
 
 void ClientProxy::setSelectedItemsByObjectId(
@@ -230,7 +230,7 @@ void ClientProxy::setSelectedItemsByObjectId(
             debugIds << ref.debugId();
         }
 
-        m_inspectorClient->setCurrentObjects(debugIds);
+        m_inspectorHelperClient->setCurrentObjects(debugIds);
     }
 }
 
@@ -269,7 +269,7 @@ void ClientProxy::log(LogDirection direction, const QString &message)
     msg += message;
 
     if (m_adapter)
-        m_adapter.data()->logServiceActivity("QDeclarativeDebug", msg);
+        m_adapter.data()->logServiceActivity("QmlDebug", msg);
 }
 
 QList<QmlDebugObjectReference>
@@ -442,7 +442,7 @@ quint32 ClientProxy::queryExpressionResult(int objectDebugId,
 void ClientProxy::clearComponentCache()
 {
     if (isConnected())
-        m_inspectorClient->clearComponentCache();
+        m_inspectorHelperClient->clearComponentCache();
 }
 
 bool ClientProxy::addObjectWatch(int objectDebugId)
@@ -551,7 +551,7 @@ void ClientProxy::fetchRootObjects(
     }
     foreach (const QmlDebugObjectReference & obj, context.objects()) {
         quint32 queryId = 0;
-        using namespace QmlJsDebugClient::Constants;
+        using namespace QmlDebug::Constants;
         if (m_engineClient->objectName() == QML_DEBUGGER &&
                 m_engineClient->serviceVersion() >= CURRENT_SUPPORTED_VERSION) {
             //Fetch only root objects
@@ -622,11 +622,11 @@ void ClientProxy::objectTreeFetched(quint32 queryId, const QVariant &result)
         emit objectTreeUpdated();
 
         if (isConnected()) {
-            if (!m_inspectorClient->currentObjects().isEmpty())
-                onCurrentObjectsChanged(m_inspectorClient->currentObjects(),
+            if (!m_inspectorHelperClient->currentObjects().isEmpty())
+                onCurrentObjectsChanged(m_inspectorHelperClient->currentObjects(),
                                         false);
 
-            m_inspectorClient->setObjectIdList(m_rootObjects);
+            m_inspectorHelperClient->setObjectIdList(m_rootObjects);
         }
     }
 }
@@ -662,48 +662,48 @@ void ClientProxy::buildDebugIdHashRecursive(const QmlDebugObjectReference &ref)
 void ClientProxy::reloadQmlViewer()
 {
     if (isConnected())
-        m_inspectorClient->reloadViewer();
+        m_inspectorHelperClient->reloadViewer();
 }
 
 void ClientProxy::setDesignModeBehavior(bool inDesignMode)
 {
     if (isConnected())
-        m_inspectorClient->setDesignModeBehavior(inDesignMode);
+        m_inspectorHelperClient->setDesignModeBehavior(inDesignMode);
 }
 
 void ClientProxy::setAnimationSpeed(qreal slowDownFactor)
 {
     if (isConnected())
-        m_inspectorClient->setAnimationSpeed(slowDownFactor);
+        m_inspectorHelperClient->setAnimationSpeed(slowDownFactor);
 }
 
 void ClientProxy::setAnimationPaused(bool paused)
 {
     if (isConnected())
-        m_inspectorClient->setAnimationPaused(paused);
+        m_inspectorHelperClient->setAnimationPaused(paused);
 }
 
 void ClientProxy::changeToZoomTool()
 {
     if (isConnected())
-        m_inspectorClient->changeToZoomTool();
+        m_inspectorHelperClient->changeToZoomTool();
 }
 void ClientProxy::changeToSelectTool()
 {
     if (isConnected())
-        m_inspectorClient->changeToSelectTool();
+        m_inspectorHelperClient->changeToSelectTool();
 }
 
 void ClientProxy::changeToSelectMarqueeTool()
 {
     if (isConnected())
-        m_inspectorClient->changeToSelectMarqueeTool();
+        m_inspectorHelperClient->changeToSelectMarqueeTool();
 }
 
 void ClientProxy::showAppOnTop(bool showOnTop)
 {
     if (isConnected())
-        m_inspectorClient->showAppOnTop(showOnTop);
+        m_inspectorHelperClient->showAppOnTop(showOnTop);
 }
 
 void ClientProxy::createQmlObject(const QString &qmlText, int parentDebugId,
@@ -711,28 +711,28 @@ void ClientProxy::createQmlObject(const QString &qmlText, int parentDebugId,
                                   const QString &filename, int order)
 {
     if (isConnected())
-        m_inspectorClient->createQmlObject(qmlText, parentDebugId, imports,
+        m_inspectorHelperClient->createQmlObject(qmlText, parentDebugId, imports,
                                            filename, order);
 }
 
 void ClientProxy::destroyQmlObject(int debugId)
 {
     if (isConnected())
-        m_inspectorClient->destroyQmlObject(debugId);
+        m_inspectorHelperClient->destroyQmlObject(debugId);
 }
 
 void ClientProxy::reparentQmlObject(int debugId, int newParent)
 {
     if (isConnected())
-        m_inspectorClient->reparentQmlObject(debugId, newParent);
+        m_inspectorHelperClient->reparentQmlObject(debugId, newParent);
 }
 
 void ClientProxy::updateConnected()
 {
-    bool isConnected = m_inspectorClient &&
-            m_inspectorClient->status() == QDeclarativeDebugClient::Enabled &&
+    bool isConnected = m_inspectorHelperClient &&
+            m_inspectorHelperClient->status() == QmlDebugClient::Enabled &&
             m_engineClient &&
-            m_engineClient->status() == QDeclarativeDebugClient::Enabled;
+            m_engineClient->status() == QmlDebugClient::Enabled;
 
     if (isConnected != m_isConnected) {
         m_isConnected = isConnected;
diff --git a/src/plugins/qmljsinspector/qmljsclientproxy.h b/src/plugins/qmljsinspector/qmljsclientproxy.h
index b61cf8bd36..a26d798ed8 100644
--- a/src/plugins/qmljsinspector/qmljsclientproxy.h
+++ b/src/plugins/qmljsinspector/qmljsclientproxy.h
@@ -51,7 +51,7 @@ QHash<QPair<QString, int>, QHash<QPair<int, int>, QList<int> > > DebugIdHash;
 namespace Internal {
 
 class InspectorPlugin;
-class QmlJSInspectorClient;
+class QmlToolsClient;
 
 class ClientProxy : public QObject
 {
@@ -104,7 +104,7 @@ public:
     void fetchRootObjects(const QmlDebugContextReference &context, bool clear);
     void insertObjectInTreeIfNeeded(const QmlDebugObjectReference &object);
 
-    QDeclarativeDebugClient *qmlDebugger() const;
+    QmlDebugClient *inspectorClient() const;
 
 signals:
     void objectTreeUpdated();
@@ -153,8 +153,8 @@ public slots:
 
 private slots:
     void connectToServer();
-    void clientStatusChanged(QDeclarativeDebugClient::Status status);
-    void engineClientStatusChanged(QDeclarativeDebugClient::Status status);
+    void clientStatusChanged(QmlDebugClient::Status status);
+    void engineClientStatusChanged(QmlDebugClient::Status status);
 
     void onCurrentObjectsChanged(const QList<int> &debugIds,
                                  bool requestIfNeeded = true);
@@ -190,8 +190,8 @@ private:
     void buildDebugIdHashRecursive(const QmlDebugObjectReference &ref);
 
     QWeakPointer<Debugger::QmlAdapter> m_adapter;
-    QmlEngineDebugClient *m_engineClient;
-    QmlJSInspectorClient *m_inspectorClient;
+    BaseEngineDebugClient *m_engineClient;
+    QmlToolsClient *m_inspectorHelperClient;
 
     quint32 m_engineQueryId;
     quint32 m_contextQueryId;
diff --git a/src/plugins/qmljsinspector/qmljsinspector.cpp b/src/plugins/qmljsinspector/qmljsinspector.cpp
index 9ba204a45c..5f0b365328 100644
--- a/src/plugins/qmljsinspector/qmljsinspector.cpp
+++ b/src/plugins/qmljsinspector/qmljsinspector.cpp
@@ -50,7 +50,7 @@
 #include <debugger/qml/qmlengine.h>
 #include <debugger/debuggerstartparameters.h>
 #include <debugger/qml/qmladapter.h>
-#include <qmljsdebugclient/qmljsdebugclientconstants.h>
+#include <qmldebug/qmldebugconstants.h>
 
 #include <utils/filterlineedit.h>
 #include <utils/qtcassert.h>
@@ -353,9 +353,9 @@ void InspectorUi::connected(ClientProxy *clientProxy)
     if (m_clientProxy)
         connect(m_clientProxy, SIGNAL(result(quint32,QVariant)),
                 SLOT(onResult(quint32,QVariant)));
-    using namespace QmlJsDebugClient::Constants;
-    if (m_clientProxy->qmlDebugger()->objectName() == QML_DEBUGGER
-            && m_clientProxy->qmlDebugger()->serviceVersion()
+    using namespace QmlDebug::Constants;
+    if (m_clientProxy->inspectorClient()->objectName() == QML_DEBUGGER
+            && m_clientProxy->inspectorClient()->serviceVersion()
             >= CURRENT_SUPPORTED_VERSION)
         m_toolBar->setZoomToolEnabled(false);
     else
diff --git a/src/plugins/qmljsinspector/qmljsinspector.pro b/src/plugins/qmljsinspector/qmljsinspector.pro
index f82d39c810..8efc53ed94 100644
--- a/src/plugins/qmljsinspector/qmljsinspector.pro
+++ b/src/plugins/qmljsinspector/qmljsinspector.pro
@@ -20,7 +20,7 @@ qmljsclientproxy.h \
 qmljsinspector.h \
 qmljsinspectortoolbar.h \
 qmljslivetextpreview.h \
-qmljsinspectorclient.h \
+qmltoolsclient.h \
 qmljscontextcrumblepath.h \
 qmljsinspectorsettings.h \
 qmljspropertyinspector.h
@@ -31,7 +31,7 @@ qmljsclientproxy.cpp \
 qmljsinspector.cpp \
 qmljsinspectortoolbar.cpp \
 qmljslivetextpreview.cpp \
-qmljsinspectorclient.cpp \
+qmltoolsclient.cpp \
 qmljscontextcrumblepath.cpp \
 qmljsinspectorsettings.cpp \
 qmljspropertyinspector.cpp
@@ -41,7 +41,7 @@ include(../../../share/qtcreator/qml/qmljsdebugger/protocol/protocol.pri)
 RESOURCES += qmljsinspector.qrc
 
 include(../../qtcreatorplugin.pri)
-include(../../libs/qmljsdebugclient/qmljsdebugclient.pri)
+include(../../libs/qmldebug/qmldebug.pri)
 include(../../libs/qmleditorwidgets/qmleditorwidgets.pri)
 
 include(../../plugins/debugger/debugger.pri)
diff --git a/src/plugins/qmljsinspector/qmljsinspector.qbs b/src/plugins/qmljsinspector/qmljsinspector.qbs
index f5dc9516dc..96e47a62a3 100644
--- a/src/plugins/qmljsinspector/qmljsinspector.qbs
+++ b/src/plugins/qmljsinspector/qmljsinspector.qbs
@@ -13,7 +13,7 @@ QtcPlugin {
     Depends { name: "QmlJS" }
     Depends { name: "QmlJSTools" }
     Depends { name: "QmlEditorWidgets" }
-    Depends { name: "QmlJSDebugClient" }
+    Depends { name: "QmlDebug" }
 
 
     Depends { name: "cpp" }
@@ -36,7 +36,7 @@ QtcPlugin {
         "qmljsinspector.h",
         "qmljsinspectortoolbar.h",
         "qmljslivetextpreview.h",
-        "qmljsinspectorclient.h",
+        "qmltoolsclient.h",
         "qmljscontextcrumblepath.h",
         "qmljsinspectorsettings.h",
         "qmljspropertyinspector.h",
@@ -46,7 +46,7 @@ QtcPlugin {
         "qmljsinspector.cpp",
         "qmljsinspectortoolbar.cpp",
         "qmljslivetextpreview.cpp",
-        "qmljsinspectorclient.cpp",
+        "qmltoolsclient.cpp",
         "qmljscontextcrumblepath.cpp",
         "qmljsinspectorsettings.cpp",
         "qmljspropertyinspector.cpp",
diff --git a/src/plugins/qmljsinspector/qmljsprivateapi.h b/src/plugins/qmljsinspector/qmljsprivateapi.h
index 003938c548..cf865f2e40 100644
--- a/src/plugins/qmljsinspector/qmljsprivateapi.h
+++ b/src/plugins/qmljsinspector/qmljsprivateapi.h
@@ -32,11 +32,11 @@
 #ifndef QMLJSPRIVATEAPI_H
 #define QMLJSPRIVATEAPI_H
 
-#include <qmljsdebugclient/qmlenginedebugclient.h>
-#include <qmljsdebugclient/qdeclarativedebugclient.h>
-#include <qmljsdebugclient/qdeclarativeengineclient.h>
-#include <qmljsdebugclient/qmldebuggerclient.h>
+#include <qmldebug/baseenginedebugclient.h>
+#include <qmldebug/qmldebugclient.h>
+#include <qmldebug/declarativeenginedebugclient.h>
+#include <qmldebug/qmlenginedebugclient.h>
 
-using namespace QmlJsDebugClient;
+using namespace QmlDebug;
 
 #endif // QMLJSPRIVATEAPI_H
diff --git a/src/plugins/qmljsinspector/qmljsinspectorclient.cpp b/src/plugins/qmljsinspector/qmltoolsclient.cpp
index 251b024e45..702fc74818 100644
--- a/src/plugins/qmljsinspector/qmljsinspectorclient.cpp
+++ b/src/plugins/qmljsinspector/qmltoolsclient.cpp
@@ -29,7 +29,7 @@
 **
 **************************************************************************/
 
-#include "qmljsinspectorclient.h"
+#include "qmltoolsclient.h"
 #include "qmljsclientproxy.h"
 #include "qmljsinspectorconstants.h"
 
@@ -38,20 +38,20 @@ using namespace QmlJSDebugger;
 namespace QmlJSInspector {
 namespace Internal {
 
-QmlJSInspectorClient::QmlJSInspectorClient(QDeclarativeDebugConnection *client,
+QmlToolsClient::QmlToolsClient(QmlDebugConnection *client,
                                            QObject * /*parent*/)
-    : QDeclarativeDebugClient(QLatin1String("QDeclarativeObserverMode"), client),
+    : QmlDebugClient(QLatin1String("QDeclarativeObserverMode"), client),
       m_connection(client)
 {
     setObjectName(name());
 }
 
-void QmlJSInspectorClient::statusChanged(Status status)
+void QmlToolsClient::statusChanged(Status status)
 {
     emit connectedStatusChanged(status);
 }
 
-void QmlJSInspectorClient::messageReceived(const QByteArray &message)
+void QmlToolsClient::messageReceived(const QByteArray &message)
 {
     QDataStream ds(message);
 
@@ -139,12 +139,12 @@ void QmlJSInspectorClient::messageReceived(const QByteArray &message)
     }
 }
 
-QList<int> QmlJSInspectorClient::currentObjects() const
+QList<int> QmlToolsClient::currentObjects() const
 {
     return m_currentDebugIds;
 }
 
-void QmlJSInspectorClient::setCurrentObjects(const QList<int> &debugIds)
+void QmlToolsClient::setCurrentObjects(const QList<int> &debugIds)
 {
     if (!m_connection || !m_connection->isConnected())
         return;
@@ -179,7 +179,7 @@ void recurseObjectIdList(const QmlDebugObjectReference &ref,
         recurseObjectIdList(child, debugIds, objectIds);
 }
 
-void QmlJSInspectorClient::setObjectIdList(
+void QmlToolsClient::setObjectIdList(
         const QList<QmlDebugObjectReference> &objectRoots)
 {
     QByteArray message;
@@ -207,7 +207,7 @@ void QmlJSInspectorClient::setObjectIdList(
     sendMessage(message);
 }
 
-void QmlJSInspectorClient::clearComponentCache()
+void QmlToolsClient::clearComponentCache()
 {
     if (!m_connection || !m_connection->isConnected())
         return;
@@ -223,7 +223,7 @@ void QmlJSInspectorClient::clearComponentCache()
     sendMessage(message);
 }
 
-void QmlJSInspectorClient::reloadViewer()
+void QmlToolsClient::reloadViewer()
 {
     if (!m_connection || !m_connection->isConnected())
         return;
@@ -239,7 +239,7 @@ void QmlJSInspectorClient::reloadViewer()
     sendMessage(message);
 }
 
-void QmlJSInspectorClient::setDesignModeBehavior(bool inDesignMode)
+void QmlToolsClient::setDesignModeBehavior(bool inDesignMode)
 {
     if (!m_connection || !m_connection->isConnected())
         return;
@@ -256,7 +256,7 @@ void QmlJSInspectorClient::setDesignModeBehavior(bool inDesignMode)
     sendMessage(message);
 }
 
-void QmlJSInspectorClient::setAnimationSpeed(qreal slowDownFactor)
+void QmlToolsClient::setAnimationSpeed(qreal slowDownFactor)
 {
     if (!m_connection || !m_connection->isConnected())
         return;
@@ -274,7 +274,7 @@ void QmlJSInspectorClient::setAnimationSpeed(qreal slowDownFactor)
     sendMessage(message);
 }
 
-void QmlJSInspectorClient::setAnimationPaused(bool paused)
+void QmlToolsClient::setAnimationPaused(bool paused)
 {
     if (!m_connection || !m_connection->isConnected())
         return;
@@ -291,7 +291,7 @@ void QmlJSInspectorClient::setAnimationPaused(bool paused)
     sendMessage(message);
 }
 
-void QmlJSInspectorClient::changeToSelectTool()
+void QmlToolsClient::changeToSelectTool()
 {
     if (!m_connection || !m_connection->isConnected())
         return;
@@ -309,7 +309,7 @@ void QmlJSInspectorClient::changeToSelectTool()
     sendMessage(message);
 }
 
-void QmlJSInspectorClient::changeToSelectMarqueeTool()
+void QmlToolsClient::changeToSelectMarqueeTool()
 {
     if (!m_connection || !m_connection->isConnected())
         return;
@@ -327,7 +327,7 @@ void QmlJSInspectorClient::changeToSelectMarqueeTool()
     sendMessage(message);
 }
 
-void QmlJSInspectorClient::changeToZoomTool()
+void QmlToolsClient::changeToZoomTool()
 {
     if (!m_connection || !m_connection->isConnected())
         return;
@@ -345,7 +345,7 @@ void QmlJSInspectorClient::changeToZoomTool()
     sendMessage(message);
 }
 
-void QmlJSInspectorClient::showAppOnTop(bool showOnTop)
+void QmlToolsClient::showAppOnTop(bool showOnTop)
 {
     if (!m_connection || !m_connection->isConnected())
         return;
@@ -361,7 +361,7 @@ void QmlJSInspectorClient::showAppOnTop(bool showOnTop)
     sendMessage(message);
 }
 
-void QmlJSInspectorClient::createQmlObject(const QString &qmlText,
+void QmlToolsClient::createQmlObject(const QString &qmlText,
                                            int parentDebugId,
                                            const QStringList &imports,
                                            const QString &filename, int order)
@@ -387,7 +387,7 @@ void QmlJSInspectorClient::createQmlObject(const QString &qmlText,
     sendMessage(message);
 }
 
-void QmlJSInspectorClient::destroyQmlObject(int debugId)
+void QmlToolsClient::destroyQmlObject(int debugId)
 {
     if (!m_connection || !m_connection->isConnected())
         return;
@@ -402,7 +402,7 @@ void QmlJSInspectorClient::destroyQmlObject(int debugId)
     sendMessage(message);
 }
 
-void QmlJSInspectorClient::reparentQmlObject(int debugId, int newParent)
+void QmlToolsClient::reparentQmlObject(int debugId, int newParent)
 {
     if (!m_connection || !m_connection->isConnected())
         return;
@@ -421,7 +421,7 @@ void QmlJSInspectorClient::reparentQmlObject(int debugId, int newParent)
 }
 
 
-void QmlJSInspectorClient::applyChangesToQmlFile()
+void QmlToolsClient::applyChangesToQmlFile()
 {
     if (!m_connection || !m_connection->isConnected())
         return;
@@ -429,7 +429,7 @@ void QmlJSInspectorClient::applyChangesToQmlFile()
     // TODO
 }
 
-void QmlJSInspectorClient::applyChangesFromQmlFile()
+void QmlToolsClient::applyChangesFromQmlFile()
 {
     if (!m_connection || !m_connection->isConnected())
         return;
@@ -437,7 +437,7 @@ void QmlJSInspectorClient::applyChangesFromQmlFile()
     // TODO
 }
 
-void QmlJSInspectorClient::log(LogDirection direction,
+void QmlToolsClient::log(LogDirection direction,
                                InspectorProtocol::Message message,
                                const QString &extra)
 {
diff --git a/src/plugins/qmljsinspector/qmljsinspectorclient.h b/src/plugins/qmljsinspector/qmltoolsclient.h
index 623e734043..28f7978163 100644
--- a/src/plugins/qmljsinspector/qmljsinspectorclient.h
+++ b/src/plugins/qmljsinspector/qmltoolsclient.h
@@ -29,8 +29,8 @@
 **
 **************************************************************************/
 
-#ifndef QMLJSDESIGNDEBUGCLIENT_H
-#define QMLJSDESIGNDEBUGCLIENT_H
+#ifndef QMLTOOLSCLIENT_H
+#define QMLTOOLSCLIENT_H
 
 #include "qmljsprivateapi.h"
 
@@ -39,11 +39,11 @@
 namespace QmlJSInspector {
 namespace Internal {
 
-class QmlJSInspectorClient : public QDeclarativeDebugClient
+class QmlToolsClient : public QmlDebugClient
 {
     Q_OBJECT
 public:
-    explicit QmlJSInspectorClient(QDeclarativeDebugConnection *client,
+    explicit QmlToolsClient(QmlDebugConnection *client,
                                   QObject *parent = 0);
 
     void setCurrentObjects(const QList<int> &debugIds);
@@ -73,7 +73,7 @@ public:
     void clearComponentCache();
 
 signals:
-    void connectedStatusChanged(QDeclarativeDebugClient::Status status);
+    void connectedStatusChanged(QmlDebugClient::Status status);
 
     void currentObjectsChanged(const QList<int> &debugIds);
     void selectToolActivated();
@@ -102,10 +102,10 @@ private:
              const QString &extra = QString());
 
     QList<int> m_currentDebugIds;
-    QDeclarativeDebugConnection *m_connection;
+    QmlDebugConnection *m_connection;
 };
 
 } // namespace Internal
 } // namespace QmlJSInspector
 
-#endif // QMLJSDESIGNDEBUGCLIENT_H
+#endif // QMLTOOLSCLIENT_H
diff --git a/src/plugins/qmljstools/qmljstools.qbs b/src/plugins/qmljstools/qmljstools.qbs
index f45700d50c..4c635ff196 100644
--- a/src/plugins/qmljstools/qmljstools.qbs
+++ b/src/plugins/qmljstools/qmljstools.qbs
@@ -13,7 +13,7 @@ QtcPlugin {
     Depends { name: "ProjectExplorer" }
     Depends { name: "TextEditor" }
     Depends { name: "Locator" }
-    Depends { name: "QmlJSDebugClient" }
+    Depends { name: "QmlDebug" }
     Depends { name: "QtSupport" }
 
     Depends { name: "cpp" }
@@ -61,7 +61,7 @@ QtcPlugin {
 
     ProductModule {
         Depends { name: "CppTools" }
-        Depends { name: "QmlJSDebugClient" }
+        Depends { name: "QmlDebug" }
     }
 }
 
diff --git a/src/plugins/qmlprofiler/qmlprofiler.pro b/src/plugins/qmlprofiler/qmlprofiler.pro
index 4dc919bef2..b7adadcd8e 100644
--- a/src/plugins/qmlprofiler/qmlprofiler.pro
+++ b/src/plugins/qmlprofiler/qmlprofiler.pro
@@ -16,7 +16,7 @@ include(../../plugins/analyzerbase/analyzerbase.pri)
 include(../../plugins/qmlprojectmanager/qmlprojectmanager.pri)
 include(../../plugins/qt4projectmanager/qt4projectmanager.pri)
 include(../../plugins/remotelinux/remotelinux.pri)
-include(../../libs/qmljsdebugclient/qmljsdebugclient.pri)
+include(../../libs/qmldebug/qmldebug.pri)
 include(../../libs/extensionsystem/extensionsystem.pri)
 include(canvas/canvas.pri)
 
diff --git a/src/plugins/qmlprofiler/qmlprofiler.qbs b/src/plugins/qmlprofiler/qmlprofiler.qbs
index 90500db5f4..414e13a26d 100644
--- a/src/plugins/qmlprofiler/qmlprofiler.qbs
+++ b/src/plugins/qmlprofiler/qmlprofiler.qbs
@@ -15,7 +15,7 @@ QtcPlugin {
     Depends { name: "QtSupport" }
     Depends { name: "symbianutils" }
     Depends { name: "TextEditor" }
-    Depends { name: "QmlJSDebugClient" }
+    Depends { name: "QmlDebug" }
     Depends { name: "QmlJS" }
     Depends { name: "QmlJSTools" }
     Depends { name: "CPlusPlus" }
diff --git a/src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp b/src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp
index a9002aa85b..d219f948cb 100644
--- a/src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp
@@ -34,16 +34,16 @@
 #include "qmlprofilertool.h"
 #include "qmlprofilerplugin.h"
 
-#include <qmljsdebugclient/qdeclarativedebugclient.h>
-#include <qmljsdebugclient/qmlprofilertraceclient.h>
-#include <qmljsdebugclient/qv8profilerclient.h>
+#include <qmldebug/qmldebugclient.h>
+#include <qmldebug/qmlprofilertraceclient.h>
+#include <qmldebug/qv8profilerclient.h>
 
 #include <utils/qtcassert.h>
 #include <QWeakPointer>
 #include <QTimer>
 #include <QMessageBox>
 
-using namespace QmlJsDebugClient;
+using namespace QmlDebug;
 using namespace Core;
 
 namespace QmlProfiler {
@@ -55,7 +55,7 @@ public:
 
     QmlProfilerStateManager* profilerState;
 
-    QDeclarativeDebugConnection *connection;
+    QmlDebugConnection *connection;
     QWeakPointer<QmlProfilerTraceClient> qmlclientplugin;
     QWeakPointer<QV8ProfilerClient> v8clientplugin;
 
@@ -136,7 +136,7 @@ void QmlProfilerClientManager::connectClient(quint16 port)
 {
     if (d->connection)
         delete d->connection;
-    d->connection = new QDeclarativeDebugConnection;
+    d->connection = new QmlDebugConnection;
     enableServices();
     connect(d->connection, SIGNAL(stateChanged(QAbstractSocket::SocketState)),
             this, SLOT(connectionStateChanged()));
@@ -164,9 +164,9 @@ void QmlProfilerClientManager::connectClientSignals()
         connect(d->qmlclientplugin.data(), SIGNAL(complete()),
                 this, SLOT(qmlComplete()));
         connect(d->qmlclientplugin.data(),
-                SIGNAL(range(int,qint64,qint64,QStringList,QmlJsDebugClient::QmlEventLocation)),
+                SIGNAL(range(int,qint64,qint64,QStringList,QmlDebug::QmlEventLocation)),
                 this,
-                SIGNAL(addRangedEvent(int,qint64,qint64,QStringList,QmlJsDebugClient::QmlEventLocation)));
+                SIGNAL(addRangedEvent(int,qint64,qint64,QStringList,QmlDebug::QmlEventLocation)));
         connect(d->qmlclientplugin.data(), SIGNAL(traceFinished(qint64)),
                 this, SIGNAL(traceFinished(qint64)));
         connect(d->qmlclientplugin.data(), SIGNAL(traceStarted(qint64)),
@@ -196,9 +196,9 @@ void QmlProfilerClientManager::disconnectClientSignals()
         disconnect(d->qmlclientplugin.data(), SIGNAL(complete()),
                    this, SLOT(qmlComplete()));
         disconnect(d->qmlclientplugin.data(),
-                   SIGNAL(range(int,qint64,qint64,QStringList,QmlJsDebugClient::QmlEventLocation)),
+                   SIGNAL(range(int,qint64,qint64,QStringList,QmlDebug::QmlEventLocation)),
                    this,
-                   SIGNAL(addRangedEvent(int,qint64,qint64,QStringList,QmlJsDebugClient::QmlEventLocation)));
+                   SIGNAL(addRangedEvent(int,qint64,qint64,QStringList,QmlDebug::QmlEventLocation)));
         disconnect(d->qmlclientplugin.data(), SIGNAL(traceFinished(qint64)),
                    this, SIGNAL(traceFinished(qint64)));
         disconnect(d->qmlclientplugin.data(), SIGNAL(traceStarted(qint64)),
@@ -341,7 +341,7 @@ void QmlProfilerClientManager::retryMessageBoxFinished(int result)
 void QmlProfilerClientManager::qmlComplete()
 {
     d->qmlDataReady = true;
-    if (!d->v8clientplugin || d->v8clientplugin.data()->status() != QDeclarativeDebugClient::Enabled || d->v8DataReady) {
+    if (!d->v8clientplugin || d->v8clientplugin.data()->status() != QmlDebugClient::Enabled || d->v8DataReady) {
         emit dataReadyForProcessing();
         // once complete is sent, reset the flags
         d->qmlDataReady = false;
@@ -352,7 +352,7 @@ void QmlProfilerClientManager::qmlComplete()
 void QmlProfilerClientManager::v8Complete()
 {
     d->v8DataReady = true;
-    if (!d->qmlclientplugin || d->qmlclientplugin.data()->status() != QDeclarativeDebugClient::Enabled || d->qmlDataReady) {
+    if (!d->qmlclientplugin || d->qmlclientplugin.data()->status() != QmlDebugClient::Enabled || d->qmlDataReady) {
         emit dataReadyForProcessing();
         // once complete is sent, reset the flags
         d->v8DataReady = false;
diff --git a/src/plugins/qmlprofiler/qmlprofilerclientmanager.h b/src/plugins/qmlprofiler/qmlprofilerclientmanager.h
index 0ee061993a..fe5fb3d01a 100644
--- a/src/plugins/qmlprofiler/qmlprofilerclientmanager.h
+++ b/src/plugins/qmlprofiler/qmlprofilerclientmanager.h
@@ -37,7 +37,7 @@
 #include <QStringList>
 
 #include "qmlprofilerstatemanager.h"
-#include <qmljsdebugclient/qmlprofilereventlocation.h>
+#include <qmldebug/qmlprofilereventlocation.h>
 
 namespace QmlProfiler {
 namespace Internal {
@@ -61,7 +61,7 @@ signals:
     void connectionFailed();
 
     // data
-    void addRangedEvent(int,qint64,qint64,QStringList,QmlJsDebugClient::QmlEventLocation);
+    void addRangedEvent(int,qint64,qint64,QStringList,QmlDebug::QmlEventLocation);
     void addV8Event(int,QString,QString,int,double,double);
     void addFrameEvent(qint64,int,int);
     void traceStarted(qint64);
diff --git a/src/plugins/qmlprofiler/qmlprofilerdatamodel.cpp b/src/plugins/qmlprofiler/qmlprofilerdatamodel.cpp
index 95d44dca63..266895a3b9 100644
--- a/src/plugins/qmlprofiler/qmlprofilerdatamodel.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilerdatamodel.cpp
@@ -45,7 +45,7 @@
 #include <QTimer>
 #include <utils/qtcassert.h>
 
-using namespace QmlJsDebugClient;
+using namespace QmlDebug;
 
 namespace QmlProfiler {
 namespace Internal {
@@ -295,11 +295,11 @@ void QmlProfilerDataModel::clear()
 
 void QmlProfilerDataModel::addRangedEvent(int type, qint64 startTime, qint64 length,
                                           const QStringList &data,
-                                          const QmlJsDebugClient::QmlEventLocation &location)
+                                          const QmlDebug::QmlEventLocation &location)
 {
     const QChar colon = QLatin1Char(':');
     QString displayName, eventHashStr, details;
-    QmlJsDebugClient::QmlEventLocation eventLocation = location;
+    QmlDebug::QmlEventLocation eventLocation = location;
 
     setState(AcquiringData);
 
@@ -319,7 +319,7 @@ void QmlProfilerDataModel::addRangedEvent(int type, qint64 startTime, qint64 len
 
     // backwards compatibility: "compiling" events don't have a proper location in older
     // version of the protocol, but the filename is passed in the details string
-    if (type == QmlJsDebugClient::Compiling && eventLocation.filename.isEmpty()) {
+    if (type == QmlDebug::Compiling && eventLocation.filename.isEmpty()) {
         eventLocation.filename = details;
         eventLocation.line = 1;
         eventLocation.column = 1;
@@ -344,7 +344,7 @@ void QmlProfilerDataModel::addRangedEvent(int type, qint64 startTime, qint64 len
         newEvent->displayName = displayName;
         newEvent->location = eventLocation;
         newEvent->eventHashStr = eventHashStr;
-        newEvent->eventType = (QmlJsDebugClient::QmlEventType)type;
+        newEvent->eventType = (QmlDebug::QmlEventType)type;
         newEvent->details = details;
         d->rangeEventDictionary.insert(eventHashStr, newEvent);
     }
@@ -393,7 +393,7 @@ void QmlProfilerDataModel::addFrameEvent(qint64 time, int framerate, int animati
         newEvent = new QmlRangeEventData;
         newEvent->displayName = displayName;
         newEvent->eventHashStr = eventHashStr;
-        newEvent->eventType = QmlJsDebugClient::Painting;
+        newEvent->eventType = QmlDebug::Painting;
         newEvent->details = details;
         d->rangeEventDictionary.insert(eventHashStr, newEvent);
     }
@@ -442,7 +442,7 @@ void QmlProfilerDataModel::setTraceStartTime(qint64 time)
 ////////////////////////////////////////////////////////////////////////////////////
 
 QString QmlProfilerDataModel::getHashStringForQmlEvent(
-        const QmlJsDebugClient::QmlEventLocation &location, int eventType)
+        const QmlDebug::QmlEventLocation &location, int eventType)
 {
     return QString("%1:%2:%3:%4").arg(location.filename,
                                       QString::number(location.line),
@@ -679,7 +679,7 @@ int QmlProfilerDataModel::getColumn(int index) const
 QString QmlProfilerDataModel::getDetails(int index) const
 {
     // special: animations
-    if (d->startInstanceList[index].statsInfo->eventType == QmlJsDebugClient::Painting &&
+    if (d->startInstanceList[index].statsInfo->eventType == QmlDebug::Painting &&
             d->startInstanceList[index].animationCount >= 0)
         return tr("%1 animations at %2 FPS").arg(
                     QString::number(d->startInstanceList[index].animationCount),
@@ -943,7 +943,7 @@ void QmlProfilerDataModel::QmlProfilerDataModelPrivate::findAnimationLimits()
     lastFrameEvent = 0;
 
     for (int i = 0; i < startInstanceList.count(); i++) {
-        if (startInstanceList[i].statsInfo->eventType == QmlJsDebugClient::Painting &&
+        if (startInstanceList[i].statsInfo->eventType == QmlDebug::Painting &&
                 startInstanceList[i].animationCount >= 0) {
             int animationcount = startInstanceList[i].animationCount;
             if (lastFrameEvent) {
@@ -971,7 +971,7 @@ void QmlProfilerDataModel::QmlProfilerDataModelPrivate::computeNestingLevels()
     int lastBaseEventIndex = 0;
     qint64 lastBaseEventEndTime = traceStartTime;
 
-    for (int i = 0; i < QmlJsDebugClient::MaximumQmlEventType; i++) {
+    for (int i = 0; i < QmlDebug::MaximumQmlEventType; i++) {
         nestingLevels << Constants::QML_MIN_LEVEL;
         QHash<int, qint64> dummyHash;
         dummyHash[Constants::QML_MIN_LEVEL] = 0;
@@ -982,7 +982,7 @@ void QmlProfilerDataModel::QmlProfilerDataModelPrivate::computeNestingLevels()
         qint64 st = startInstanceList[i].startTime;
         int type = startInstanceList[i].statsInfo->eventType;
 
-        if (type == QmlJsDebugClient::Painting) {
+        if (type == QmlDebug::Painting) {
             // animation/paint events have level 0 by definition (same as "mainprogram"),
             // but are not considered parents of other events for statistical purposes
             startInstanceList[i].level = Constants::QML_MIN_LEVEL - 1;
@@ -1101,7 +1101,7 @@ void QmlProfilerDataModel::QmlProfilerDataModelPrivate::redoTree(qint64 fromTime
             continue;
         }
 
-        if (eventDescription->eventType == QmlJsDebugClient::Painting) {
+        if (eventDescription->eventType == QmlDebug::Painting) {
             // skip animation/paint events
             continue;
         }
@@ -1265,7 +1265,7 @@ void QmlProfilerDataModel::QmlProfilerDataModelPrivate::clearQmlRootEvent()
     qmlRootEvent.location = QmlEventLocation();
     qmlRootEvent.eventHashStr = rootEventName();
     qmlRootEvent.details = rootEventDescription();
-    qmlRootEvent.eventType = QmlJsDebugClient::Binding;
+    qmlRootEvent.eventType = QmlDebug::Binding;
     qmlRootEvent.duration = 0;
     qmlRootEvent.calls = 0;
     qmlRootEvent.minTime = 0;
@@ -1314,7 +1314,7 @@ void QmlProfilerDataModel::reloadDetails()
 }
 
 void QmlProfilerDataModel::rewriteDetailsString(int eventType,
-                                                const QmlJsDebugClient::QmlEventLocation &location,
+                                                const QmlDebug::QmlEventLocation &location,
                                                 const QString &newString)
 {
     QString eventHashStr = getHashStringForQmlEvent(location, eventType);
@@ -1377,7 +1377,7 @@ bool QmlProfilerDataModel::save(const QString &filename)
         stream.writeAttribute("startTime", QString::number(rangedEvent.startTime));
         stream.writeAttribute("duration", QString::number(rangedEvent.duration));
         stream.writeAttribute("eventIndex", QString::number(d->rangeEventDictionary.keys().indexOf(rangedEvent.statsInfo->eventHashStr)));
-        if (rangedEvent.statsInfo->eventType == QmlJsDebugClient::Painting && rangedEvent.animationCount >= 0) {
+        if (rangedEvent.statsInfo->eventType == QmlDebug::Painting && rangedEvent.animationCount >= 0) {
             // animation frame
             stream.writeAttribute("framerate", QString::number(rangedEvent.frameRate));
             stream.writeAttribute("animationcount", QString::number(rangedEvent.animationCount));
diff --git a/src/plugins/qmlprofiler/qmlprofilerdatamodel.h b/src/plugins/qmlprofiler/qmlprofilerdatamodel.h
index 7e2ab03470..f7bb98ba63 100644
--- a/src/plugins/qmlprofiler/qmlprofilerdatamodel.h
+++ b/src/plugins/qmlprofiler/qmlprofilerdatamodel.h
@@ -33,8 +33,8 @@
 #ifndef QMLPROFILERDATAMODEL_H
 #define QMLPROFILERDATAMODEL_H
 
-#include <qmljsdebugclient/qmlprofilereventtypes.h>
-#include <qmljsdebugclient/qmlprofilereventlocation.h>
+#include <qmldebug/qmlprofilereventtypes.h>
+#include <qmldebug/qmlprofilereventlocation.h>
 #include "qv8profilerdatamodel.h"
 
 #include <QHash>
@@ -55,8 +55,8 @@ struct QmlRangeEventData
     QString displayName;
     QString eventHashStr;
     QString details;
-    QmlJsDebugClient::QmlEventLocation location;
-    QmlJsDebugClient::QmlEventType eventType;
+    QmlDebug::QmlEventLocation location;
+    QmlDebug::QmlEventType eventType;
 
     QHash <QString, QmlRangeEventRelative *> parentHash;
     QHash <QString, QmlRangeEventRelative *> childrenHash;
@@ -102,12 +102,12 @@ public:
     QList<QV8EventData *> getV8Events() const;
     QV8EventData *v8EventDescription(int eventId) const;
 
-    static QString getHashStringForQmlEvent(const QmlJsDebugClient::QmlEventLocation &location, int eventType);
+    static QString getHashStringForQmlEvent(const QmlDebug::QmlEventLocation &location, int eventType);
     static QString getHashStringForV8Event(const QString &displayName, const QString &function);
     static QString rootEventName();
     static QString rootEventDescription();
-    static QString qmlEventTypeAsString(QmlJsDebugClient::QmlEventType typeEnum);
-    static QmlJsDebugClient::QmlEventType qmlEventTypeAsEnum(const QString &typeString);
+    static QString qmlEventTypeAsString(QmlDebug::QmlEventType typeEnum);
+    static QmlDebug::QmlEventType qmlEventTypeAsEnum(const QString &typeString);
 
     int findFirstIndex(qint64 startTime) const;
     int findFirstIndexNoParents(qint64 startTime) const;
@@ -159,7 +159,7 @@ signals:
     void countChanged();
     void error(const QString &error);
 
-    void requestDetailsForLocation(int eventType, const QmlJsDebugClient::QmlEventLocation &location);
+    void requestDetailsForLocation(int eventType, const QmlDebug::QmlEventLocation &location);
     void detailsChanged(int eventId, const QString &newString);
     void reloadDetailLabels();
     void reloadDocumentsForDetails();
@@ -168,7 +168,7 @@ public slots:
     void clear();
 
     void addRangedEvent(int type, qint64 startTime, qint64 length,
-                        const QStringList &data, const QmlJsDebugClient::QmlEventLocation &location);
+                        const QStringList &data, const QmlDebug::QmlEventLocation &location);
     void addV8Event(int depth,const QString &function,const QString &filename, int lineNumber, double totalTime, double selfTime);
     void addFrameEvent(qint64 time, int framerate, int animationcount);
     void setTraceStartTime(qint64 time);
@@ -181,7 +181,7 @@ public slots:
     void setFilename(const QString &filename);
     void load();
 
-    void rewriteDetailsString(int eventType, const QmlJsDebugClient::QmlEventLocation &location, const QString &newString);
+    void rewriteDetailsString(int eventType, const QmlDebug::QmlEventLocation &location, const QString &newString);
     void finishedRewritingDetails();
 
 private:
diff --git a/src/plugins/qmlprofiler/qmlprofilerdetailsrewriter.cpp b/src/plugins/qmlprofiler/qmlprofilerdetailsrewriter.cpp
index f2bbb4f1f3..d0ddc9ed0c 100644
--- a/src/plugins/qmlprofiler/qmlprofilerdetailsrewriter.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilerdetailsrewriter.cpp
@@ -42,7 +42,7 @@ namespace QmlProfiler {
 namespace Internal {
 
 struct PendingEvent {
-    QmlJsDebugClient::QmlEventLocation location;
+    QmlDebug::QmlEventLocation location;
     QString localFile;
     int eventType;
 };
@@ -123,7 +123,7 @@ QmlProfilerDetailsRewriter::~QmlProfilerDetailsRewriter()
 }
 
 void QmlProfilerDetailsRewriter::requestDetailsForLocation(int type,
-        const QmlJsDebugClient::QmlEventLocation &location)
+        const QmlDebug::QmlEventLocation &location)
 {
     QString localFile = QUrl(location.filename).toLocalFile();
 
@@ -152,7 +152,7 @@ void QmlProfilerDetailsRewriter::reloadDocuments()
 }
 
 void QmlProfilerDetailsRewriter::rewriteDetailsForLocation(QTextStream &textDoc,
-        QmlJS::Document::Ptr doc, int type, const QmlJsDebugClient::QmlEventLocation &location)
+        QmlJS::Document::Ptr doc, int type, const QmlDebug::QmlEventLocation &location)
 {
     PropertyVisitor propertyVisitor;
     QmlJS::AST::Node *node = propertyVisitor(doc->ast(), location.line, location.column);
diff --git a/src/plugins/qmlprofiler/qmlprofilerdetailsrewriter.h b/src/plugins/qmlprofiler/qmlprofilerdetailsrewriter.h
index 4f61f8a640..3bf13f033e 100644
--- a/src/plugins/qmlprofiler/qmlprofilerdetailsrewriter.h
+++ b/src/plugins/qmlprofiler/qmlprofilerdetailsrewriter.h
@@ -35,7 +35,7 @@
 
 #include <QObject>
 
-#include <qmljsdebugclient/qmlprofilereventlocation.h>
+#include <qmldebug/qmlprofilereventlocation.h>
 #include <qmljs/qmljsdocument.h>
 
 namespace QmlProfiler {
@@ -50,13 +50,13 @@ public:
 
 private:
     void rewriteDetailsForLocation(QTextStream &textDoc,QmlJS::Document::Ptr doc, int type,
-                                   const QmlJsDebugClient::QmlEventLocation &location);
+                                   const QmlDebug::QmlEventLocation &location);
 public slots:
-    void requestDetailsForLocation(int type, const QmlJsDebugClient::QmlEventLocation &location);
+    void requestDetailsForLocation(int type, const QmlDebug::QmlEventLocation &location);
     void reloadDocuments();
     void documentReady(QmlJS::Document::Ptr doc);
 signals:
-    void rewriteDetailsString(int type, const QmlJsDebugClient::QmlEventLocation &location,
+    void rewriteDetailsString(int type, const QmlDebug::QmlEventLocation &location,
                               const QString &details);
     void eventDetailsChanged();
 private:
diff --git a/src/plugins/qmlprofiler/qmlprofilerengine.cpp b/src/plugins/qmlprofiler/qmlprofilerengine.cpp
index 5990df7c4c..5cf2268bf9 100644
--- a/src/plugins/qmlprofiler/qmlprofilerengine.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilerengine.cpp
@@ -46,7 +46,7 @@
 #include <projectexplorer/applicationrunconfiguration.h>
 #include <qt4projectmanager/qt-s60/s60devicedebugruncontrol.h>
 #include <qt4projectmanager/qt-s60/s60devicerunconfiguration.h>
-#include <qmljsdebugclient/qdeclarativeoutputparser.h>
+#include <qmldebug/qmloutputparser.h>
 
 #include <QMainWindow>
 #include <QMessageBox>
@@ -78,7 +78,7 @@ public:
 
     AbstractQmlProfilerRunner *m_runner;
     QTimer m_noDebugOutputTimer;
-    QmlJsDebugClient::QDeclarativeOutputParser m_outputParser;
+    QmlDebug::QmlOutputParser m_outputParser;
 };
 
 AbstractQmlProfilerRunner *
diff --git a/src/plugins/qmlprofiler/qmlprofilereventview.cpp b/src/plugins/qmlprofiler/qmlprofilereventview.cpp
index 169635fec9..35ca59cf5a 100644
--- a/src/plugins/qmlprofiler/qmlprofilereventview.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilereventview.cpp
@@ -54,7 +54,7 @@
 
 #include <utils/qtcassert.h>
 
-using namespace QmlJsDebugClient;
+using namespace QmlDebug;
 
 namespace QmlProfiler {
 namespace Internal {
diff --git a/src/plugins/qmlprofiler/qmlprofilereventview.h b/src/plugins/qmlprofiler/qmlprofilereventview.h
index 409ea4dca0..aa60d5684b 100644
--- a/src/plugins/qmlprofiler/qmlprofilereventview.h
+++ b/src/plugins/qmlprofiler/qmlprofilereventview.h
@@ -35,7 +35,7 @@
 
 #include <QTreeView>
 #include <QStandardItemModel>
-#include <qmljsdebugclient/qmlprofilereventtypes.h>
+#include <qmldebug/qmlprofilereventtypes.h>
 #include "qmlprofilerdatamodel.h"
 
 #include <analyzerbase/ianalyzertool.h>
diff --git a/src/plugins/qmlprofiler/qmlprofilertool.cpp b/src/plugins/qmlprofiler/qmlprofilertool.cpp
index b654f03b63..5dd0dc0176 100644
--- a/src/plugins/qmlprofiler/qmlprofilertool.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilertool.cpp
@@ -93,7 +93,7 @@ using namespace Analyzer;
 using namespace Analyzer::Constants;
 using namespace QmlProfiler::Internal;
 using namespace QmlProfiler::Constants;
-using namespace QmlJsDebugClient;
+using namespace QmlDebug;
 using namespace ProjectExplorer;
 using namespace QmlProjectManager;
 using namespace RemoteLinux;
@@ -152,7 +152,7 @@ QmlProfilerTool::QmlProfilerTool(QObject *parent)
     d->m_profilerDataModel = new QmlProfilerDataModel(this);
     connect(d->m_profilerDataModel, SIGNAL(stateChanged()), this, SLOT(profilerDataModelStateChanged()));
     connect(d->m_profilerDataModel, SIGNAL(error(QString)), this, SLOT(showErrorDialog(QString)));
-    connect(d->m_profilerConnections, SIGNAL(addRangedEvent(int,qint64,qint64,QStringList,QmlJsDebugClient::QmlEventLocation)), d->m_profilerDataModel, SLOT(addRangedEvent(int,qint64,qint64,QStringList,QmlJsDebugClient::QmlEventLocation)));
+    connect(d->m_profilerConnections, SIGNAL(addRangedEvent(int,qint64,qint64,QStringList,QmlDebug::QmlEventLocation)), d->m_profilerDataModel, SLOT(addRangedEvent(int,qint64,qint64,QStringList,QmlDebug::QmlEventLocation)));
     connect(d->m_profilerConnections, SIGNAL(addV8Event(int,QString,QString,int,double,double)), d->m_profilerDataModel, SLOT(addV8Event(int,QString,QString,int,double,double)));
     connect(d->m_profilerConnections, SIGNAL(addFrameEvent(qint64,int,int)), d->m_profilerDataModel, SLOT(addFrameEvent(qint64,int,int)));
     connect(d->m_profilerConnections, SIGNAL(traceStarted(qint64)), d->m_profilerDataModel, SLOT(setTraceStartTime(qint64)));
@@ -161,10 +161,10 @@ QmlProfilerTool::QmlProfilerTool(QObject *parent)
 
 
     d->m_detailsRewriter = new QmlProfilerDetailsRewriter(this);
-    connect(d->m_profilerDataModel, SIGNAL(requestDetailsForLocation(int,QmlJsDebugClient::QmlEventLocation)),
-            d->m_detailsRewriter, SLOT(requestDetailsForLocation(int,QmlJsDebugClient::QmlEventLocation)));
-    connect(d->m_detailsRewriter, SIGNAL(rewriteDetailsString(int,QmlJsDebugClient::QmlEventLocation,QString)),
-            d->m_profilerDataModel, SLOT(rewriteDetailsString(int,QmlJsDebugClient::QmlEventLocation,QString)));
+    connect(d->m_profilerDataModel, SIGNAL(requestDetailsForLocation(int,QmlDebug::QmlEventLocation)),
+            d->m_detailsRewriter, SLOT(requestDetailsForLocation(int,QmlDebug::QmlEventLocation)));
+    connect(d->m_detailsRewriter, SIGNAL(rewriteDetailsString(int,QmlDebug::QmlEventLocation,QString)),
+            d->m_profilerDataModel, SLOT(rewriteDetailsString(int,QmlDebug::QmlEventLocation,QString)));
     connect(d->m_detailsRewriter, SIGNAL(eventDetailsChanged()), d->m_profilerDataModel, SLOT(finishedRewritingDetails()));
     connect(d->m_profilerDataModel, SIGNAL(reloadDocumentsForDetails()), d->m_detailsRewriter, SLOT(reloadDocuments()));
 
diff --git a/src/plugins/qmlprofiler/qmlprofilertraceview.cpp b/src/plugins/qmlprofiler/qmlprofilertraceview.cpp
index cb7623f6e6..5cd35c2418 100644
--- a/src/plugins/qmlprofiler/qmlprofilertraceview.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilertraceview.cpp
@@ -54,7 +54,7 @@
 
 #include <math.h>
 
-using namespace QmlJsDebugClient;
+using namespace QmlDebug;
 
 namespace QmlProfiler {
 namespace Internal {
diff --git a/src/plugins/qmlprofiler/qv8profilerdatamodel.cpp b/src/plugins/qmlprofiler/qv8profilerdatamodel.cpp
index d58f198be6..d1f7da117d 100644
--- a/src/plugins/qmlprofiler/qv8profilerdatamodel.cpp
+++ b/src/plugins/qmlprofiler/qv8profilerdatamodel.cpp
@@ -3,7 +3,7 @@
 
 #include <QStringList>
 
-using namespace QmlJsDebugClient;
+using namespace QmlDebug;
 
 QT_BEGIN_NAMESPACE
 Q_DECLARE_TYPEINFO(QmlProfiler::Internal::QV8EventData, Q_MOVABLE_TYPE);
diff --git a/src/plugins/qmlprofiler/timelinerenderer.cpp b/src/plugins/qmlprofiler/timelinerenderer.cpp
index a078d31f84..276f341d25 100644
--- a/src/plugins/qmlprofiler/timelinerenderer.cpp
+++ b/src/plugins/qmlprofiler/timelinerenderer.cpp
@@ -53,7 +53,7 @@ TimelineRenderer::TimelineRenderer(QDeclarativeItem *parent) :
     setFlag(QGraphicsItem::ItemHasNoContents, false);
     setAcceptedMouseButtons(Qt::LeftButton);
     setAcceptHoverEvents(true);
-    for (int i=0; i<QmlJsDebugClient::MaximumQmlEventType; i++)
+    for (int i=0; i<QmlDebug::MaximumQmlEventType; i++)
         m_rowsExpanded << false;
 }
 
@@ -85,7 +85,7 @@ void TimelineRenderer::paint(QPainter *p, const QStyleOptionGraphicsItem *, QWid
 
     m_rowWidths.clear();
     // The "1+" is because the reference screenshot features an empty row per type, in order to leave space for the title
-    for (int i=0; i<QmlJsDebugClient::MaximumQmlEventType; i++) {
+    for (int i=0; i<QmlDebug::MaximumQmlEventType; i++) {
         m_rowWidths << 1 + (m_rowsExpanded[i] ? m_profilerDataModel->uniqueEventsOfType(i) :
                                                 m_profilerDataModel->maxNestingForType(i));
     }
@@ -93,7 +93,7 @@ void TimelineRenderer::paint(QPainter *p, const QStyleOptionGraphicsItem *, QWid
     // event rows
     m_rowStarts.clear();
     int pos = 0;
-    for (int i=0; i<QmlJsDebugClient::MaximumQmlEventType; i++) {
+    for (int i=0; i<QmlDebug::MaximumQmlEventType; i++) {
         m_rowStarts << pos;
         pos += DefaultRowHeight * m_rowWidths[i];
     }
@@ -102,7 +102,7 @@ void TimelineRenderer::paint(QPainter *p, const QStyleOptionGraphicsItem *, QWid
 
     // speedup: don't draw overlapping events, just skip them
     m_rowLastX.clear();
-    for (int i=0; i<QmlJsDebugClient::MaximumQmlEventType; i++)
+    for (int i=0; i<QmlDebug::MaximumQmlEventType; i++)
         for (int j=0; j<m_rowWidths[i]; j++)
             m_rowLastX << -m_startTime * m_spacing;
author	Kai Koehne <kai.koehne@nokia.com>	2012-04-18 12:06:10 +0200
committer	Kai Koehne <kai.koehne@nokia.com>	2012-04-18 14:31:36 +0200
commit	4d3395b990038483f49096d7a6bffbd611f9a064 (patch)
tree	3210450a1e200a00ec206acc46c5d9b9cf0b296d
parent	53702d5dcc75a3f96b9ac4eb849b737a7694495b (diff)
download	qt-creator-4d3395b990038483f49096d7a6bffbd611f9a064.tar.gz