aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/types/qquickworkerscript.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@digia.com>2013-06-18 13:17:01 +0200
committerSimon Hausmann <simon.hausmann@digia.com>2013-06-18 13:49:44 +0200
commit9262851159ff4705a5dc19b75682af14b056219f (patch)
tree6ec31932e27cd07cbe42e9604546e1817427ccba /src/qml/types/qquickworkerscript.cpp
parent1075939a2b040aec3f63a20f27e4f9e502eabc97 (diff)
Fix two more errors in the worker script auto test
Change-Id: Ib1359a985efae18cd4fc8344b81092af57f1a9d4 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/types/qquickworkerscript.cpp')
-rw-r--r--src/qml/types/qquickworkerscript.cpp7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/qml/types/qquickworkerscript.cpp b/src/qml/types/qquickworkerscript.cpp
index 825ab6ba1f..35d504a8a2 100644
--- a/src/qml/types/qquickworkerscript.cpp
+++ b/src/qml/types/qquickworkerscript.cpp
@@ -352,8 +352,7 @@ void QQuickWorkerScriptEnginePrivate::processMessage(int id, const QByteArray &d
} catch (QV4::Exception &e) {
e.accept(ctx);
QQmlError error;
- error.setDescription(e.value().toQString());
-// ### QQmlExpressionPrivate::exceptionToError(e, error);
+ QQmlExpressionPrivate::exceptionToError(e, error);
reportScriptException(script, error);
}
}
@@ -379,11 +378,7 @@ void QQuickWorkerScriptEnginePrivate::processLoad(int id, const QUrl &url)
if (activation.isEmpty())
return;
- // XXX ???
- // workerEngine->baseUrl = url;
-
QV4::ExecutionEngine *v4 = QV8Engine::getV4(workerEngine);
-
QV4::Script program(v4, activation.asObject(), sourceCode, url.toString());
QV4::ExecutionContext *ctx = v4->current;