diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-26 13:42:08 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-26 13:42:08 +0100 |
commit | 3832b1e05b80a0f509be17dd3619a2f8bb70074f (patch) | |
tree | 3763c243b13c8228b1508ce5902dc2f587cabfdd /tools/qmlprofiler | |
parent | f9fae251ca07401ee1b0039edc6ea6b7a522b5a7 (diff) | |
parent | 5c53861cced2d40490e4c7bfc202aadc532df4c2 (diff) |
Merge remote-tracking branch 'origin/5.5' into 5.6
Conflicts:
tests/auto/qml/qml.pro
tools/qmlprofiler/qmlprofilerclient.cpp
Change-Id: Id47f15a5ab38f8ec79f0a26c92805acba62caac4
Diffstat (limited to 'tools/qmlprofiler')
-rw-r--r-- | tools/qmlprofiler/qmlprofilerclient.cpp | 2 |
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); |