diff options
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | src/script/parser/qscriptlexer.cpp | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/.qmake.conf b/.qmake.conf index 068da42..a9b6a32 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,4 +1,4 @@ load(qt_build_config) CONFIG += qt_example_installs -MODULE_VERSION = 5.5.0 +MODULE_VERSION = 5.6.0 diff --git a/src/script/parser/qscriptlexer.cpp b/src/script/parser/qscriptlexer.cpp index 637b4f4..1f2948d 100644 --- a/src/script/parser/qscriptlexer.cpp +++ b/src/script/parser/qscriptlexer.cpp @@ -31,8 +31,6 @@ QT_BEGIN_NAMESPACE -Q_CORE_EXPORT double qstrtod(const char *s00, char const **se, bool *ok); - #define shiftWindowsLineBreak() \ do { \ if (((current == '\r') && (next1 == '\n')) \ @@ -712,7 +710,7 @@ int QScript::Lexer::lex() double dval = 0; if (state == Number) { - dval = qstrtod(buffer8, 0, 0); + dval = QByteArray::fromRawData(buffer8, pos8).toDouble(); } else if (state == Hex) { // scan hex numbers dval = QScript::integerFromString(buffer8, pos8, 16); state = Number; |