aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/v8/qjsvalue.cpp
diff options
context:
space:
mode:
authorKent Hansen <kent.hansen@nokia.com>2012-03-07 13:56:33 +0100
committerQt by Nokia <qt-info@nokia.com>2012-05-03 09:52:41 +0200
commitb9ccb579c4c93f23e6ceeea26b07d418ad4e5562 (patch)
treee4def9e28c2b6a612531d698b31e2ec99ea451f1 /src/qml/qml/v8/qjsvalue.cpp
parent51b3e8e7ef5af9ff6c40027daa3a04c58b6a4bd2 (diff)
Remove QJS exception API
This API has been deprecated for a while. It's legacy stuff from QtScript. Until someone proves that QJSValue::isError() isn't sufficient to handle JavaScript exceptions, we won't provide any additional API for that. Also removed QJSValuePrivate::lessThan(), which was using the exception mechanism, but the function itself wasn't used anymore (another remnant from the QtScript days). Change-Id: I3dffc6a7835874153f90d25ae2a72c93ea6db39a Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/qml/qml/v8/qjsvalue.cpp')
-rw-r--r--src/qml/qml/v8/qjsvalue.cpp14
1 files changed, 6 insertions, 8 deletions
diff --git a/src/qml/qml/v8/qjsvalue.cpp b/src/qml/qml/v8/qjsvalue.cpp
index 6ecb97d2e5..3cde607995 100644
--- a/src/qml/qml/v8/qjsvalue.cpp
+++ b/src/qml/qml/v8/qjsvalue.cpp
@@ -459,9 +459,8 @@ QVariant QJSValue::toVariant() const
Calling call() can cause an exception to occur in the script engine;
in that case, call() returns the value that was thrown (typically an
- \c{Error} object). You can call
- QJSEngine::hasUncaughtException() to determine if an exception
- occurred.
+ \c{Error} object). You can call isError() on the return value to
+ determine whether an exception occurred.
\sa isCallable(), callWithInstance(), callAsConstructor()
*/
@@ -487,9 +486,8 @@ QJSValue QJSValue::call(const QJSValueList &args)
Calling call() can cause an exception to occur in the script engine;
in that case, call() returns the value that was thrown (typically an
- \c{Error} object). You can call
- QJSEngine::hasUncaughtException() to determine if an exception
- occurred.
+ \c{Error} object). You can call isError() on the return value to
+ determine whether an exception occurred.
\sa call()
*/
@@ -513,8 +511,8 @@ QJSValue QJSValue::callWithInstance(const QJSValue &instance, const QJSValueList
Calling this function can cause an exception to occur in the
script engine; in that case, the value that was thrown
(typically an \c{Error} object) is returned. You can call
- QJSEngine::hasUncaughtException() to determine if an exception
- occurred.
+ isError() on the return value to determine whether an
+ exception occurred.
\sa call(), QJSEngine::newObject()
*/