QmlJS: Make evaluator understand expression statements.

Reviewed-by: Erik Verbruggen

1 files changed, 7 insertions, 10 deletions

diff --git a/src/libs/qmljs/qmljsscopebuilder.cpp b/src/libs/qmljs/qmljsscopebuilder.cpp
index 477f82db3b2..77b6dcc5cbf 100644
--- a/src/libs/qmljs/qmljsscopebuilder.cpp
+++ b/src/libs/qmljs/qmljsscopebuilder.cpp
@@ -238,16 +238,13 @@ void ScopeBuilder::setQmlScopeObject(Node *node)
                     if (scriptBinding->qualifiedId && scriptBinding->qualifiedId->name
                             && scriptBinding->qualifiedId->name->asString() == QLatin1String("target")
                             && ! scriptBinding->qualifiedId->next) {
-                        // ### make Evaluate understand statements.
-                        if (ExpressionStatement *expStmt = cast<ExpressionStatement *>(scriptBinding->statement)) {
-                            Evaluate evaluator(_context);
-                            const Value *targetValue = evaluator(expStmt->expression);
-
-                            if (const ObjectValue *target = value_cast<const ObjectValue *>(targetValue)) {
-                                scopeChain.qmlScopeObjects.prepend(target);
-                            } else {
-                                scopeChain.qmlScopeObjects.clear();
-                            }
+                        Evaluate evaluator(_context);
+                        const Value *targetValue = evaluator(scriptBinding->statement);
+
+                        if (const ObjectValue *target = value_cast<const ObjectValue *>(targetValue)) {
+                            scopeChain.qmlScopeObjects.prepend(target);
+                        } else {
+                            scopeChain.qmlScopeObjects.clear();
                         }
                     }
                 }