aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/qqmljavascriptexpression.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@digia.com>2013-05-28 13:33:50 +0200
committerSimon Hausmann <simon.hausmann@digia.com>2013-05-29 09:20:12 +0200
commita3a73c6cafbe28068afb60ebe41eb2b6cdfacd36 (patch)
tree6599ced8c3d992341148a585e5828efaa072e7d4 /src/qml/qml/qqmljavascriptexpression.cpp
parenteeb43b3aff1ae100bbe31f4892fe5a8cec8a3a86 (diff)
Remove some leftovers from the v8bindings
The shared context concept was only used there, so remove code that was referring to it. Change-Id: I5ae56049a83818c898ef1cc4e68a5333a9374656 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml/qqmljavascriptexpression.cpp')
-rw-r--r--src/qml/qml/qqmljavascriptexpression.cpp14
1 files changed, 0 insertions, 14 deletions
diff --git a/src/qml/qml/qqmljavascriptexpression.cpp b/src/qml/qml/qqmljavascriptexpression.cpp
index a44ce540c2..81d5f237b5 100644
--- a/src/qml/qml/qqmljavascriptexpression.cpp
+++ b/src/qml/qml/qqmljavascriptexpression.cpp
@@ -149,19 +149,10 @@ QQmlJavaScriptExpression::evaluate(QQmlContextData *context,
QQmlContextData *lastSharedContext = 0;
QObject *lastSharedScope = 0;
- bool sharedContext = useSharedContext();
-
// All code that follows must check with watcher before it accesses data members
// incase we have been deleted.
DeleteWatcher watcher(this);
- if (sharedContext) {
- lastSharedContext = ep->sharedContext;
- lastSharedScope = ep->sharedScope;
- ep->sharedContext = context;
- ep->sharedScope = scopeObject();
- }
-
QV4::Value result;
QV4::ExecutionEngine *v4 = QV8Engine::getV4(ep->v8engine());
QV4::ExecutionContext *ctx = v4->current;
@@ -193,11 +184,6 @@ QQmlJavaScriptExpression::evaluate(QQmlContextData *context,
}
}
- if (sharedContext) {
- ep->sharedContext = lastSharedContext;
- ep->sharedScope = lastSharedScope;
- }
-
if (capture.errorString) {
for (int ii = 0; ii < capture.errorString->count(); ++ii)
qWarning("%s", qPrintable(capture.errorString->at(ii)));