feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.7'

Browse Source 
Change-Id: Ifec1f8dc20a18f432ec6ccf68153f31fff3f8b29
This commit is contained in:
Eike Ziller
2018-06-25 11:07:03 +02:00
parent a7871ada78 77c260e14c
commit 997f7166fd
78 changed files with 754 additions and 290 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/qmlprofiler/qmltypedevent.cpp
View File

@@ -42,9 +42,8 @@ QDataStream &operator>>(QDataStream &stream, QmlTypedEvent &event)
RangeType rangeType = MaximumRangeType;
if (!stream.atEnd()) {
stream >> subtype;
rangeType = static_cast<RangeType>(subtype);
if (rangeType < 0 || rangeType > MaximumRangeType)
rangeType = MaximumRangeType;
if (subtype >= 0 && subtype < MaximumRangeType)
rangeType = static_cast<RangeType>(subtype);
} else {
subtype = -1;
}