From 1abeeefcb43a2a0d8b9b7beb6018800663e4b035 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Fri, 28 Mar 2014 12:26:04 +0100 Subject: [PATCH] Fix failing autotest due to wrong Qt datastream version Actually use the exact version that we decided by the connection handshake. Change-Id: Ib3cbecd57366a3bb52cc48242027968c12213e80 Reviewed-by: Simon Hausmann --- tests/auto/qml/debugger/shared/qqmlenginedebugclient.cpp | 6 +++++- tests/auto/qml/debugger/shared/qqmlenginedebugclient.h | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/tests/auto/qml/debugger/shared/qqmlenginedebugclient.cpp b/tests/auto/qml/debugger/shared/qqmlenginedebugclient.cpp index 610d80d..022ba8c 100644 --- a/tests/auto/qml/debugger/shared/qqmlenginedebugclient.cpp +++ b/tests/auto/qml/debugger/shared/qqmlenginedebugclient.cpp @@ -84,7 +84,8 @@ QQmlEngineDebugClient::QQmlEngineDebugClient( QQmlDebugConnection *connection) : QQmlDebugClient(QLatin1String("QmlDebugger"), connection), m_nextId(0), - m_valid(false) + m_valid(false), + m_connection(connection) { } @@ -467,6 +468,9 @@ void QQmlEngineDebugClient::messageReceived(const QByteArray &data) { m_valid = false; QDataStream ds(data); + ds.setVersion(m_connection->dataStreamVersion()); + + int queryId; QByteArray type; ds >> type >> queryId; diff --git a/tests/auto/qml/debugger/shared/qqmlenginedebugclient.h b/tests/auto/qml/debugger/shared/qqmlenginedebugclient.h index 1d4b95a..2712692 100644 --- a/tests/auto/qml/debugger/shared/qqmlenginedebugclient.h +++ b/tests/auto/qml/debugger/shared/qqmlenginedebugclient.h @@ -242,6 +242,8 @@ private: QmlDebugObjectReference m_object; QList m_objects; QVariant m_exprResult; + + QQmlDebugConnection *m_connection; }; #endif // QQMLENGINEDEBUGCLIENT_H -- 2.7.4