feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote branch 'origin/1.3'

Browse Source 
Conflicts:
	doc/qtcreator.qdoc
	src/plugins/debugger/watchhandler.cpp
This commit is contained in:
Oswald Buddenhagen
2009-11-27 20:06:01 +01:00
parent 6c56fbfedc f1d79229d3
commit b0b5bde2e9
19 changed files with 2085 additions and 1945 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libs/cplusplus/LookupContext.cpp
View File

@@ -524,8 +524,8 @@ void LookupContext::expandFunction(Function *function,
q->isGlobal());
const QList<Symbol *> candidates = resolveClassOrNamespace(nestedNameSpec, visibleScopes);
for (int j = 0; j < candidates.size(); ++j) {
expand(candidates.at(j)->asScopedSymbol()->members(),
visibleScopes, expandedScopes);
if (ScopedSymbol *scopedSymbol = candidates.at(j)->asScopedSymbol())
expand(scopedSymbol->members(), visibleScopes, expandedScopes);
}
}
}