diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2014-04-08 11:18:40 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2014-04-08 11:18:40 +0200 |
| commit | b6876586635e9c610b8362dae9c6f5e7bce9d08d (patch) | |
| tree | ffdca9894ca6e5b09e321ce0728a0ff6b9862fa6 /src/libs/cplusplus/LookupContext.cpp | |
| parent | 49bbd218cb2489abf31fae176a417621cf8885e8 (diff) | |
| parent | 780c21a1c3b5ac6b759b7423588011c89b2dad34 (diff) | |
| download | qt-creator-b6876586635e9c610b8362dae9c6f5e7bce9d08d.tar.gz | |
Merge remote-tracking branch 'origin/3.1'
Conflicts:
qtcreator.pri
qtcreator.qbs
src/plugins/cpptools/cppcompletion_test.cpp
Change-Id: Ic5e75b3ef164de664a1449ffa8579beaf5b02521
Diffstat (limited to 'src/libs/cplusplus/LookupContext.cpp')
| -rw-r--r-- | src/libs/cplusplus/LookupContext.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libs/cplusplus/LookupContext.cpp b/src/libs/cplusplus/LookupContext.cpp index 6c507fe2bc..606d39631b 100644 --- a/src/libs/cplusplus/LookupContext.cpp +++ b/src/libs/cplusplus/LookupContext.cpp @@ -1257,6 +1257,7 @@ void ClassOrNamespace::NestedClassInstantiator::instantiate(ClassOrNamespace *en } } + nestedClassOrNamespaceInstantiation->_parent = enclosingTemplateClassInstantiation; instantiate(nestedClassOrNamespace, nestedClassOrNamespaceInstantiation); enclosingTemplateClassInstantiation->_classOrNamespaces[nestedName] = |