diff options
Diffstat (limited to 'src/qml/jsapi')
| -rw-r--r-- | src/qml/jsapi/qjsengine.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/jsapi/qjsengine.cpp b/src/qml/jsapi/qjsengine.cpp index ca18bb61e6..a96ded68f0 100644 --- a/src/qml/jsapi/qjsengine.cpp +++ b/src/qml/jsapi/qjsengine.cpp @@ -485,7 +485,7 @@ static QUrl urlForFileName(const QString &fileName) the file name is accessible through the "fileName" property if it is provided with this function. - \a stackTrace is used to report whether an uncaught exception was + \a exceptionStackTrace is used to report whether an uncaught exception was thrown. If you pass a non-null pointer to a QStringList to it, it will set it to list of "stackframe messages" if the script threw an unhandled exception, or an empty list otherwise. A stackframe message has the format @@ -495,8 +495,8 @@ static QUrl urlForFileName(const QString &fileName) \note If an exception was thrown and the exception value is not an Error instance (i.e., QJSValue::isError() returns \c false), the - exception value will still be returned. Use \a stackTrace->isEmpty() to - distinguish whether the value was a normal or an exceptional return + exception value will still be returned. Use \c exceptionStackTrace->isEmpty() + to distinguish whether the value was a normal or an exceptional return value. */ QJSValue QJSEngine::evaluate(const QString& program, const QString& fileName, int lineNumber, QStringList *exceptionStackTrace) |