diff options
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | src/script/api/qscriptclass.cpp | 1 | ||||
| -rw-r--r-- | src/script/api/qscriptcontext.cpp | 1 | ||||
| -rw-r--r-- | src/script/api/qscriptengine.cpp | 2 | ||||
| -rw-r--r-- | src/script/api/qscriptvalue.cpp | 1 | ||||
| -rw-r--r-- | src/script/parser/qscriptlexer.cpp | 4 |
6 files changed, 2 insertions, 9 deletions
diff --git a/.qmake.conf b/.qmake.conf index fd7c2fa..a9b6a32 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,4 +1,4 @@ load(qt_build_config) CONFIG += qt_example_installs -MODULE_VERSION = 5.5.1 +MODULE_VERSION = 5.6.0 diff --git a/src/script/api/qscriptclass.cpp b/src/script/api/qscriptclass.cpp index 9f83940..bd7c452 100644 --- a/src/script/api/qscriptclass.cpp +++ b/src/script/api/qscriptclass.cpp @@ -31,7 +31,6 @@ \brief The QScriptClass class provides an interface for defining custom behavior of (a class of) Qt Script objects. \ingroup script - \mainclass The QScriptClass class defines an interface for handling various aspects of interaction with the Qt Script objects associated with diff --git a/src/script/api/qscriptcontext.cpp b/src/script/api/qscriptcontext.cpp index 4b1e6e7..969ac80 100644 --- a/src/script/api/qscriptcontext.cpp +++ b/src/script/api/qscriptcontext.cpp @@ -48,7 +48,6 @@ QT_BEGIN_NAMESPACE \brief The QScriptContext class represents a Qt Script function invocation. \ingroup script - \mainclass A QScriptContext provides access to the `this' object and arguments passed to a script function. You typically want to access this diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp index d0beb49..699d2e6 100644 --- a/src/script/api/qscriptengine.cpp +++ b/src/script/api/qscriptengine.cpp @@ -98,7 +98,6 @@ QT_BEGIN_NAMESPACE \brief The QScriptEngine class provides an environment for evaluating Qt Script code. \ingroup script - \mainclass See the \l{Qt Script} documentation for information about the Qt Script language, and how to get started with scripting your C++ application. @@ -4424,7 +4423,6 @@ QScriptValue QScriptEngine::objectById(qint64 id) const \brief The QScriptSyntaxCheckResult class provides the result of a script syntax check. \ingroup script - \mainclass QScriptSyntaxCheckResult is returned by QScriptEngine::checkSyntax() to provide information about the syntactical (in)correctness of a script. diff --git a/src/script/api/qscriptvalue.cpp b/src/script/api/qscriptvalue.cpp index 027c3d6..48d34cf 100644 --- a/src/script/api/qscriptvalue.cpp +++ b/src/script/api/qscriptvalue.cpp @@ -49,7 +49,6 @@ \brief The QScriptValue class acts as a container for the Qt Script data types. \ingroup script - \mainclass QScriptValue supports the types defined in the \l{ECMA-262} standard: The primitive types, which are Undefined, Null, Boolean, 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; |