From f6f59c08d5a72f26d18b2826bc8c88394e343fac Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Thu, 20 Sep 2012 11:30:11 +0200 Subject: [PATCH] QmlDesigner.NodeInstances: Use the 4.8 QDataStream The 4.8 Version of QDataStream is the lowest common denominator. temporaryOutDataStream.setVersion(QDataStream::Qt_4_8); Change-Id: I4aa681473b6349bd3e859f49d7233ff4a6d2911b Reviewed-by: Thomas Hartmann --- .../qtcreator/qml/qmlpuppet/commands/valueschangedcommand.cpp | 2 ++ .../qml2puppet/instances/nodeinstanceclientproxy.cpp | 2 ++ .../qmlpuppet/qmlpuppet/instances/nodeinstanceclientproxy.cpp | 4 ++++ 3 files changed, 8 insertions(+) diff --git a/share/qtcreator/qml/qmlpuppet/commands/valueschangedcommand.cpp b/share/qtcreator/qml/qmlpuppet/commands/valueschangedcommand.cpp index 1061f370435..b3008b9a66e 100644 --- a/share/qtcreator/qml/qmlpuppet/commands/valueschangedcommand.cpp +++ b/share/qtcreator/qml/qmlpuppet/commands/valueschangedcommand.cpp @@ -100,6 +100,7 @@ QDataStream &operator<<(QDataStream &out, const ValuesChangedCommand &command) command.m_keyNumber = keyCounter; QByteArray outDataStreamByteArray; QDataStream temporaryOutDataStream(&outDataStreamByteArray, QIODevice::WriteOnly); + temporaryOutDataStream.setVersion(QDataStream::Qt_4_8); temporaryOutDataStream << command.valueChanges();; @@ -125,6 +126,7 @@ void readSharedMemory(qint32 key, QVector *valueChangeVe if (canAttach) { QDataStream in(QByteArray::fromRawData(static_cast(sharedMemory.constData()), sharedMemory.size())); + in.setVersion(QDataStream::Qt_4_8); in >> *valueChangeVector; } } diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceclientproxy.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceclientproxy.cpp index 6faaa870a6b..7ff7718e7e6 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceclientproxy.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceclientproxy.cpp @@ -93,6 +93,7 @@ void NodeInstanceClientProxy::writeCommand(const QVariant &command) { QByteArray block; QDataStream out(&block, QIODevice::WriteOnly); + out.setVersion(QDataStream::Qt_4_8); out << quint32(0); out << quint32(m_writeCommandCounter); m_writeCommandCounter++; @@ -164,6 +165,7 @@ void NodeInstanceClientProxy::readDataStream() break; QDataStream in(m_socket); + in.setVersion(QDataStream::Qt_4_8); if (m_blockSize == 0) { in >> m_blockSize; diff --git a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/nodeinstanceclientproxy.cpp b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/nodeinstanceclientproxy.cpp index 6faaa870a6b..c2a0bbbab5e 100644 --- a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/nodeinstanceclientproxy.cpp +++ b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/nodeinstanceclientproxy.cpp @@ -93,6 +93,8 @@ void NodeInstanceClientProxy::writeCommand(const QVariant &command) { QByteArray block; QDataStream out(&block, QIODevice::WriteOnly); + out.setVersion(QDataStream::Qt_4_8); + out << quint32(0); out << quint32(m_writeCommandCounter); m_writeCommandCounter++; @@ -164,6 +166,8 @@ void NodeInstanceClientProxy::readDataStream() break; QDataStream in(m_socket); + in.setVersion(QDataStream::Qt_4_8); + if (m_blockSize == 0) { in >> m_blockSize;