Merge remote-tracking branch 'origin/5.5' into 5.6

Conflicts:
	tests/auto/qml/qml.pro
	tools/qmlprofiler/qmlprofilerclient.cpp

Change-Id: Id47f15a5ab38f8ec79f0a26c92805acba62caac4

1 files changed, 2 insertions, 0 deletions

diff --git a/tools/qmlprofiler/qmlprofilerclient.cpp b/tools/qmlprofiler/qmlprofilerclient.cpp
index 72e11eadec..b4768e6934 100644
--- a/tools/qmlprofiler/qmlprofilerclient.cpp
+++ b/tools/qmlprofiler/qmlprofilerclient.cpp
@@ -117,6 +117,7 @@ void QmlProfilerClient::sendRecordingStatus(bool record)
 {
     QByteArray ba;
     QDataStream stream(&ba, QIODevice::WriteOnly);
+    stream.setVersion(QDataStream::Qt_4_7);
     stream << record << -1 << d->features;
     sendMessage(ba);
 }
@@ -146,6 +147,7 @@ void QmlProfilerClient::messageReceived(const QByteArray &data)
 {
     QByteArray rwData = data;
     QDataStream stream(&rwData, QIODevice::ReadOnly);
+    stream.setVersion(QDataStream::Qt_4_7);
 
     // Force all the 1 << <FLAG> expressions to be done in 64 bit, to silence some warnings
     const quint64 one = static_cast<quint64>(1);