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>

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

src/libs/libs.pro

@@ -12,7 +12,7 @@ SUBDIRS   = \
     symbianutils \
     cplusplus \
     qmljs \
-    qmljsdebugclient \
+    qmldebug \
     glsl \
     qmleditorwidgets \
     qtcomponents/styleitem \

src/libs/qmljsdebugclient/qmlenginedebugclient.cpp → 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

src/libs/qmljsdebugclient/qmlenginedebugclient.h → 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

src/libs/qmljsdebugclient/qdeclarativeengineclient.h → 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

src/libs/qmljsdebugclient/qdebugmessageclient.cpp → 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

src/libs/qmljsdebugclient/qdebugmessageclient.h → 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

src/libs/qmljsdebugclient/qmljsdebugclient-lib.pri → src/libs/qmldebug/qmldebug-lib.pri

 contains(CONFIG, dll) {
-    DEFINES += QMLJSDEBUGCLIENT_LIB
+    DEFINES += QMLDEBUG_LIB
 } else {
-    DEFINES += QMLJSDEBUGCLIENT_STATIC_LIB
+    DEFINES += QMLDEBUG_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/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/qmljsdebugclientconstants.h \
+    $$PWD/qmldebugconstants.h \
     $$PWD/qdebugmessageclient.h \
-    $$PWD/qmldebuggerclient.h
+    $$PWD/qmlenginedebugclient.h
 
 SOURCES += \
-    $$PWD/qdeclarativedebugclient.cpp \
-    $$PWD/qmlenginedebugclient.cpp \
-    $$PWD/qdeclarativeoutputparser.cpp \
+    $$PWD/qmldebugclient.cpp \
+    $$PWD/baseenginedebugclient.cpp \
+    $$PWD/qmloutputparser.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
+    $$PWD/qmlenginedebugclient.cpp
 

src/libs/qmljsdebugclient/qmljsdebugclient.pri → src/libs/qmldebug/qmldebug.pri

 include(../symbianutils/symbianutils.pri)
 
-LIBS *= -l$$qtLibraryName(QmlJSDebugClient)
+LIBS *= -l$$qtLibraryName(QmlDebug)

src/libs/qmljsdebugclient/qmljsdebugclient.pro → src/libs/qmldebug/qmldebug.pro

 TEMPLATE = lib
-TARGET = QmlJSDebugClient
+TARGET = QmlDebug
 QT += network
-DEFINES += QMLJSDEBUGCLIENT_LIBRARY
 
 include(../../qtcreatorlibrary.pri)
 include(../symbianutils/symbianutils.pri)
-include(qmljsdebugclient-lib.pri)
+include(qmldebug-lib.pri)
 
 OTHER_FILES += \
-    qmljsdebugclient.pri \
-    qmljsdebugclient-lib.pri
+    qmldebug.pri
 

src/libs/qmljsdebugclient/qmljsdebugclient.qbs → 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 {

src/libs/qmljsdebugclient/qmljsdebugclient_global.h → 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

src/libs/qmljsdebugclient/qdeclarativedebugclient.h → 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: