aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@digia.com>2012-11-16 13:33:37 +0100
committerChristian Kandeler <christian.kandeler@digia.com>2012-11-16 13:41:06 +0100
commit688eaf0a86ccca82dc147e12d657bb494d71a9bc (patch)
treed1b01b7d9d88e4e958e85d5f971bfcb6aafd6f85
parentee553535c5ea0e8182b2ed6e2b5d6867f3b0899b (diff)
Loader: fix handling of UiPublicMember nodes
The InitializerSearch was missing for those. Change-Id: I590588a2595c56d10b7dc0ee2ce5a0f1d128bf23 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
-rw-r--r--src/lib/language/loader.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/lib/language/loader.cpp b/src/lib/language/loader.cpp
index 25e2a0ecf..206aca280 100644
--- a/src/lib/language/loader.cpp
+++ b/src/lib/language/loader.cpp
@@ -2735,10 +2735,15 @@ static void bindBinding(LanguageObject *result, const QString &source, UiPublicM
p.name = QStringList(ast->name.toString());
checkDuplicateBinding(result, p.name, ast->identifierToken);
- if (ast->statement)
+ if (ast->statement) {
p.valueSource = bindingProgram(result->file->fileName, source, ast->statement);
- else
+ IdentifierSearch idsearch;
+ idsearch.add(QLatin1String("base"), &p.valueSourceUsesBase);
+ idsearch.add(QLatin1String("outer"), &p.valueSourceUsesOuter);
+ idsearch.start(ast->statement);
+ } else {
p.valueSource = QScriptProgram("undefined");
+ }
result->bindings.insert(p.name, p);
}