aboutsummaryrefslogtreecommitdiffstats
path: root/main.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@digia.com>2012-11-19 22:24:12 +0100
committerErik Verbruggen <erik.verbruggen@digia.com>2012-11-20 10:43:19 +0100
commit590b9491836fc5357393c5b89c2a8f82f5ec24b6 (patch)
treea156d8317117121cbaa6e1c2d9051b54a071c104 /main.cpp
parentbe507044a9f0eefb247fb9e385808d5d39b5dc38 (diff)
Move the exception variable into the engine
It's easier to store this in the engine then in the execution context. Change-Id: I01ff447602a7d785165e774bdf6e1735c073be2d Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Diffstat (limited to 'main.cpp')
-rw-r--r--main.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/main.cpp b/main.cpp
index 7467568d0b..c9e31701a7 100644
--- a/main.cpp
+++ b/main.cpp
@@ -309,10 +309,10 @@ int main(int argc, char *argv[])
void * buf = __qmljs_create_exception_handler(ctx);
if (setjmp(*(jmp_buf *)buf)) {
- if (QQmlJS::VM::ErrorObject *e = ctx->res.asErrorObject())
+ if (QQmlJS::VM::ErrorObject *e = ctx->engine->exception.asErrorObject())
std::cerr << "Uncaught exception: " << qPrintable(e->value.toString(ctx)->toQString()) << std::endl;
else
- std::cerr << "Uncaught exception: " << qPrintable(ctx->res.toString(ctx)->toQString()) << std::endl;
+ std::cerr << "Uncaught exception: " << qPrintable(ctx->engine->exception.toString(ctx)->toQString()) << std::endl;
return EXIT_FAILURE;
}