diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2013-07-11 08:02:41 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2013-07-11 08:02:41 +0200 |
| commit | ab0c3da08ffffa8bd1dcdef19b12e2736bea528a (patch) | |
| tree | 4e3f52dad8631ad4247f39206072541887ba0815 /src/libs/cplusplus/LookupContext.cpp | |
| parent | 113c5600c909791ddfea3d424a41d982dcdda6b7 (diff) | |
| parent | 8b390350dfb7116cb554f736756f1815a798779e (diff) | |
| download | qt-creator-ab0c3da08ffffa8bd1dcdef19b12e2736bea528a.tar.gz | |
Merge remote-tracking branch 'origin/2.8'
Conflicts:
qtcreator.pri
qtcreator.qbs
src/plugins/projectexplorer/projectexplorer.cpp
Change-Id: I37e550646f877b50693043894976a693ac22ad5e
Diffstat (limited to 'src/libs/cplusplus/LookupContext.cpp')
| -rw-r--r-- | src/libs/cplusplus/LookupContext.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libs/cplusplus/LookupContext.cpp b/src/libs/cplusplus/LookupContext.cpp index ae4e1bac9a..70048af73e 100644 --- a/src/libs/cplusplus/LookupContext.cpp +++ b/src/libs/cplusplus/LookupContext.cpp @@ -1232,7 +1232,8 @@ void ClassOrNamespace::NestedClassInstantiator::instantiate(ClassOrNamespace *en foreach (Symbol *s, nestedClassOrNamespace->_symbols) { Symbol *clone = _cloner.symbol(s, &_subst); - clone->setScope(s->scope()); + if (!clone->enclosingScope()) // Not from the cache but just cloned. + clone->setScope(s->enclosingScope()); nestedClassOrNamespaceInstantiation->_symbols.append(clone); } } |