diff options
author | Aurindam Jana <aurindam.jana@nokia.com> | 2012-03-07 09:34:12 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-07 13:14:52 +0100 |
commit | 21e2a227b9f01585ac858549ebdd597a779917bc (patch) | |
tree | b16c6e4bf9f179d85621fa20bee18951ba6b6bda /src/qml/debugger/qqmldebugserver.cpp | |
parent | a85e66be34232fa17339562f0c2b51eca3f4c836 (diff) |
QmlDebugging: Revert the names of services
Revert the names of the services changed in
b855240b782395f94315f43ea3e7e182299fac48 to
maintain BC.
Change-Id: I79826d92fd09c41e0020541b0c7bb77b5b2ecb1f
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Diffstat (limited to 'src/qml/debugger/qqmldebugserver.cpp')
-rw-r--r-- | src/qml/debugger/qqmldebugserver.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/qml/debugger/qqmldebugserver.cpp b/src/qml/debugger/qqmldebugserver.cpp index 8d5c597a78..f27123a4d2 100644 --- a/src/qml/debugger/qqmldebugserver.cpp +++ b/src/qml/debugger/qqmldebugserver.cpp @@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE handshake: 1. Client sends - "QQmlDebugServer" 0 version pluginNames + "QDeclarativeDebugServer" 0 version pluginNames version: an int representing the highest protocol version the client knows pluginNames: plugins available on client side 2. Server sends @@ -69,12 +69,12 @@ QT_BEGIN_NAMESPACE pluginNames: plugins available on server side. plugins both in the client and server message are enabled. client plugin advertisement 1. Client sends - "QQmlDebugServer" 1 pluginNames + "QDeclarativeDebugServer" 1 pluginNames server plugin advertisement 1. Server sends "QQmlDebugClient" 1 pluginNames pluginVersions plugin communication: - Everything send with a header different to "QQmlDebugServer" is sent to the appropriate plugin. + Everything send with a header different to "QDeclarativeDebugServer" is sent to the appropriate plugin. */ const int protocolVersion = 1; @@ -155,7 +155,7 @@ void QQmlDebugServerPrivate::advertisePlugins() pluginNames << service->name(); pluginVersions << service->version(); } - out << QString(QLatin1String("QQmlDebugClient")) << 1 << pluginNames << pluginVersions; + out << QString(QLatin1String("QDeclarativeDebugClient")) << 1 << pluginNames << pluginVersions; } QMetaObject::invokeMethod(q, "_q_sendMessages", Qt::QueuedConnection, Q_ARG(QList<QByteArray>, QList<QByteArray>() << message)); @@ -354,7 +354,7 @@ void QQmlDebugServer::receiveMessage(const QByteArray &message) QString name; in >> name; - if (name == QLatin1String("QQmlDebugServer")) { + if (name == QLatin1String("QDeclarativeDebugServer")) { int op = -1; in >> op; if (op == 0) { @@ -373,7 +373,7 @@ void QQmlDebugServer::receiveMessage(const QByteArray &message) pluginVersions << service->version(); } - out << QString(QLatin1String("QQmlDebugClient")) << 0 << protocolVersion << pluginNames << pluginVersions; + out << QString(QLatin1String("QDeclarativeDebugClient")) << 0 << protocolVersion << pluginNames << pluginVersions; } d->connection->send(QList<QByteArray>() << helloAnswer); |