From 43fcb176fdac29b649e38deabc5f4a0ac0c2d5be Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Tue, 24 May 2016 15:03:42 +0000 Subject: [PATCH] fix regression since 56a533ea Signed-off-by: Ivailo Monev --- src/declarative/qml/parser/qdeclarativejslexer.cpp | 2 +- src/tools/lupdate/qscript.cpp | 2 +- src/tools/lupdate/qscript.g | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/declarative/qml/parser/qdeclarativejslexer.cpp b/src/declarative/qml/parser/qdeclarativejslexer.cpp index 3802a671a..6419e0e4a 100644 --- a/src/declarative/qml/parser/qdeclarativejslexer.cpp +++ b/src/declarative/qml/parser/qdeclarativejslexer.cpp @@ -822,7 +822,7 @@ int Lexer::lex() double dval = 0; if (state == Number) { - dval = QByteArray::fromRawData(buffer8, 0).toDouble(); + dval = QByteArray::fromRawData(buffer8, pos8).toDouble(); } else if (state == Hex) { // scan hex numbers dval = integerFromString(buffer8, pos8, 16); state = Number; diff --git a/src/tools/lupdate/qscript.cpp b/src/tools/lupdate/qscript.cpp index 1aecd80de..f7ce17e67 100644 --- a/src/tools/lupdate/qscript.cpp +++ b/src/tools/lupdate/qscript.cpp @@ -1731,7 +1731,7 @@ int QScript::Lexer::lex() double dval = 0; if (state == Number) { - dval = QByteArray::fromRawData(buffer8, 0).toDouble(); + dval = QByteArray::fromRawData(buffer8, pos8).toDouble(); } else if (state == Hex) { // scan hex numbers dval = QScript::integerFromString(buffer8, pos8, 16); state = Number; diff --git a/src/tools/lupdate/qscript.g b/src/tools/lupdate/qscript.g index 10a7dc094..78363266c 100644 --- a/src/tools/lupdate/qscript.g +++ b/src/tools/lupdate/qscript.g @@ -1048,7 +1048,7 @@ int QScript::Lexer::lex() double dval = 0; if (state == Number) { - dval = QByteArray::fromRawData(buffer8, 0).toDouble(); + dval = QByteArray::fromRawData(buffer8, pos8).toDouble(); } else if (state == Hex) { // scan hex numbers dval = QScript::integerFromString(buffer8, pos8, 16); state = Number; -- 2.11.0