summaryrefslogtreecommitdiffstats
path: root/src/corelib/json/qjsonparser.cpp
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-06-17 10:53:42 +0200
committerLiang Qi <liang.qi@qt.io>2016-06-17 10:53:42 +0200
commit3cb56800d581dabd18e354a24f018c55bd91f748 (patch)
tree9b8e95cf62e22026463a0f87a3625b279f457aad /src/corelib/json/qjsonparser.cpp
parentaed7540d45096791d1a824f500694a15426fd94b (diff)
parent3d8c8daae109fbd6d60e43c3d4457b581e5e62a3 (diff)
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts: tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp Change-Id: If899cda251b4dc8b8a7c6764520e88ab719737cd
Diffstat (limited to 'src/corelib/json/qjsonparser.cpp')
-rw-r--r--src/corelib/json/qjsonparser.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/json/qjsonparser.cpp b/src/corelib/json/qjsonparser.cpp
index 2926adf10a..6a3d1de99a 100644
--- a/src/corelib/json/qjsonparser.cpp
+++ b/src/corelib/json/qjsonparser.cpp
@@ -738,7 +738,7 @@ bool Parser::parseNumber(QJsonPrivate::Value *val, int baseOffset)
}
int pos = reserveSpace(sizeof(double));
- qToLittleEndian(ui, reinterpret_cast<uchar *>(data + pos));
+ qToLittleEndian(ui, data + pos);
if (current - baseOffset >= Value::MaxSize) {
lastError = QJsonParseError::DocumentTooLarge;
return false;