aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/jsapi
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@qt.io>2020-11-04 12:52:37 +0100
committerTopi Reinio <topi.reinio@qt.io>2020-11-05 09:00:44 +0100
commitc01ad45d67ec0ce96d6944496dc292a94f17efea (patch)
tree537b4b7db2bf2d9be7f55ac8139dddfd06f911b1 /src/qml/jsapi
parent9eea418e1a13e0cee239903103dbccb83e936c40 (diff)
Doc:: Fix documentation warnings for Qt QML
Task-number: QTBUG-88156 Change-Id: Ic6127c6128b4c7736cb4b5ab8ce51629388b59ca Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Diffstat (limited to 'src/qml/jsapi')
-rw-r--r--src/qml/jsapi/qjsengine.cpp6
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)