diff options
author | Kai Koehne <kai.koehne@digia.com> | 2013-11-08 14:59:45 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-11 09:00:36 +0100 |
commit | d9ed35f95835def9e3201719d986b56c01b160a2 (patch) | |
tree | a28f5959825d4ec05d84cb0270d6c9806a4edd03 /src | |
parent | 960afee2cf5041d873f596e91eeafb42d3144e98 (diff) | |
download | qtquick1-d9ed35f95835def9e3201719d986b56c01b160a2.tar.gz |
Debugger: Fix debugging with newer Qt Creator'sv5.2.0-rc1
Make sure we advertise the QDataStream version, so that Qt Creator
doesn't fall back to Qt_4.7.
This is the minimal change necessary to achieve this. QtQml does
actually consider the maximum data version announced on the client side,
but that would require bigger changes in this module ...
Task-number: QTCREATORBUG-10694
Change-Id: I1f0f005429e4d2736dc8661dd8c0d869279f856e
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/declarative/debugger/qdeclarativedebugserver.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/declarative/debugger/qdeclarativedebugserver.cpp b/src/declarative/debugger/qdeclarativedebugserver.cpp index a65c50b7..66f8cf13 100644 --- a/src/declarative/debugger/qdeclarativedebugserver.cpp +++ b/src/declarative/debugger/qdeclarativedebugserver.cpp @@ -266,7 +266,12 @@ void QDeclarativeDebugServer::receiveMessage(const QByteArray &message) QByteArray helloAnswer; { QDataStream out(&helloAnswer, QIODevice::WriteOnly); - out << QString(QLatin1String("QDeclarativeDebugClient")) << 0 << protocolVersion << d->plugins.keys(); + QList<float> fakeVersions; + for (int i = 0; i < d->plugins.size(); ++i) + fakeVersions << 1.0; + out << QString(QLatin1String("QDeclarativeDebugClient")) << 0 + << protocolVersion << d->plugins.keys() + << fakeVersions << QDataStream().version(); } d->connection->send(QList<QByteArray>() << helloAnswer); |