diff options
Diffstat (limited to 'src/qml/qml/qqmljavascriptexpression.cpp')
-rw-r--r-- | src/qml/qml/qqmljavascriptexpression.cpp | 14 |
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))); |