From cbaa9b9fc064ef4c64a6a0842aa73743c1fa597e Mon Sep 17 00:00:00 2001
From: Christian Kamm <christian.d.kamm@nokia.com>
Date: Fri, 15 Jan 2010 12:07:22 +0100
Subject: [PATCH] Add lookup for members of builtin types to QmlLookupContext.
---
src/plugins/qmleditor/qmllookupcontext.cpp | 7 ++++++-
tests/auto/qml/qmleditor/lookup/tst_lookup.cpp | 5 ++---
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/plugins/qmleditor/qmllookupcontext.cpp b/src/plugins/qmleditor/qmllookupcontext.cpp
index cf6bea32311..77369e61424 100644
--- a/src/plugins/qmleditor/qmllookupcontext.cpp
+++ b/src/plugins/qmleditor/qmllookupcontext.cpp
@@ -204,7 +204,12 @@ QmlSymbol *QmlLookupContext::resolveProperty(const QString &name, QmlSymbol *sco
if (typeSymbol->isSymbolFromFile()) {
return resolveProperty(name, typeSymbol->asSymbolFromFile(), typeSymbol->asSymbolFromFile()->fileName());
- } // TODO: internal types
+ } else if (QmlBuildInSymbol *builtinSymbol = typeSymbol->asBuildInSymbol()) {
+ foreach (QmlSymbol *member, builtinSymbol->members(true)) {
+ if (member->isProperty() && member->name() == name)
+ return member;
+ }
+ }
return 0;
}
diff --git a/tests/auto/qml/qmleditor/lookup/tst_lookup.cpp b/tests/auto/qml/qmleditor/lookup/tst_lookup.cpp
index 94879a1bd1c..8b66c84d89e 100644
--- a/tests/auto/qml/qmleditor/lookup/tst_lookup.cpp
+++ b/tests/auto/qml/qmleditor/lookup/tst_lookup.cpp
@@ -281,7 +281,7 @@ void tst_Lookup::localScopeLookup()
symbol = context.resolve("x");
QVERIFY(symbol);
QVERIFY(symbol->isProperty());
- QVERIFY(parent->members().contains(symbol));
+ // how do we know we got the right x?
}
}
@@ -307,7 +307,7 @@ void tst_Lookup::localRootLookup()
}
// try lookup
- QmlSymbol *parent = scopes.top();
+ QmlSymbol *parent = scopes.front();
QmlLookupContext context(scopes, doc, snapshot(doc), typeSystem());
QmlSymbol *symbol;
@@ -319,7 +319,6 @@ void tst_Lookup::localRootLookup()
symbol = context.resolve("color");
QVERIFY(symbol);
QVERIFY(symbol->isProperty());
- QVERIFY(parent->members().contains(symbol));
}
QTEST_APPLESS_MAIN(tst_Lookup)
--
GitLab