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 <[email protected]>

15 files changed, 64 insertions, 64 deletions

diff --git a/src/plugins/qmlprofiler/qmlprofiler.pro b/src/plugins/qmlprofiler/qmlprofiler.pro
index 4dc919bef25..b7adadcd8eb 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 90500db5f49..414e13a26d7 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 a9002aa85b8..d219f948cbe 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 0ee061993a6..fe5fb3d01ab 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 95d44dca633..266895a3b96 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 7e2ab034709..f7bb98ba63d 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 f2bbb4f1f34..d0ddc9ed0ca 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 4f61f8a6408..3bf13f033e7 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 5990df7c4c0..5cf2268bf94 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 169635fec9a..35ca59cf5ad 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 409ea4dca08..aa60d5684b8 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 b654f03b633..5dd0dc01766 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 cb7623f6e62..5cd35c2418a 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 d58f198be6b..d1f7da117da 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 a078d31f840..276f341d258 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;