aboutsummaryrefslogtreecommitdiffstats
path: root/examples/qml
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 /examples/qml
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 'examples/qml')
-rw-r--r--examples/qml/script/shell/main.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/qml/script/shell/main.cpp b/examples/qml/script/shell/main.cpp
index a4059122bf..4ea36f7e77 100644
--- a/examples/qml/script/shell/main.cpp
+++ b/examples/qml/script/shell/main.cpp
@@ -141,7 +141,7 @@ int main(int argc, char *argv[])
continue;
QJSValue result = eng->evaluate(contents, fileName, lineNumber);
- if (eng->hasUncaughtException()) {
+ if (result.isError()) {
fprintf (stderr, " %s\n\n", qPrintable(result.toString()));
return EXIT_FAILURE;
}