summaryrefslogtreecommitdiff
path: root/src/libs/cplusplus
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>2009-05-19 12:15:59 +0200
committerThorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>2009-05-19 12:16:25 +0200
commit55c69ffea48a1f81c1310efc4e6b58b4f72b078a (patch)
tree3b8c3bfe1686a3796474c8c60686989e6d0f67b0 /src/libs/cplusplus
parentc6908e028cc9e90c7436e569b7bd110c5670bdf6 (diff)
downloadqt-creator-55c69ffea48a1f81c1310efc4e6b58b4f72b078a.tar.gz
Do not expand the list of candidates when resolving fully qualified ids
Still too unstable after all. This reverts commit 6f3c9f7002f094bfe8212cf398f2de12e51d97bf.
Diffstat (limited to 'src/libs/cplusplus')
-rw-r--r--src/libs/cplusplus/LookupContext.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libs/cplusplus/LookupContext.cpp b/src/libs/cplusplus/LookupContext.cpp
index f77d9a0f3d..f5a0edd66b 100644
--- a/src/libs/cplusplus/LookupContext.cpp
+++ b/src/libs/cplusplus/LookupContext.cpp
@@ -176,7 +176,7 @@ QList<Symbol *> LookupContext::resolve(Name *name, const QList<Scope *> &visible
scopes.clear();
foreach (Symbol *candidate, candidates) {
if (ScopedSymbol *scoped = candidate->asScopedSymbol()) {
- expand(scoped->members(), visibleScopes, &scopes);
+ scopes.append(scoped->members());
}
}
}