diff options
| author | Roberto Raggi <roberto.raggi@nokia.com> | 2009-02-18 15:55:21 +0100 |
|---|---|---|
| committer | Roberto Raggi <roberto.raggi@nokia.com> | 2009-02-18 16:04:38 +0100 |
| commit | 819d0886b1951dc89524fee391ac6ddfbbf435e5 (patch) | |
| tree | 1c3b65c76160416ea55d381355b64acb2c855e95 /src/libs/cplusplus/LookupContext.cpp | |
| parent | d3bc2aabe2862947625a8187e39d86e62ddb8a0c (diff) | |
| download | qt-creator-819d0886b1951dc89524fee391ac6ddfbbf435e5.tar.gz | |
Fixes: Possible crash while resolving qualified name ids.
There is no need to "expand" again the scope we get from invoking `resolve'.
(cherry picked from commit c72c84d8375692b1cf1ad5c9ba3594f3727f9c02)
Diffstat (limited to 'src/libs/cplusplus/LookupContext.cpp')
| -rw-r--r-- | src/libs/cplusplus/LookupContext.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libs/cplusplus/LookupContext.cpp b/src/libs/cplusplus/LookupContext.cpp index 01d4e13b4e..491a9914ab 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()); } } } |