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

Merge remote-tracking branch 'origin/3.1'

Browse Source
This commit is contained in:
Eike Ziller
2014-04-14 16:53:23 +02:00
parent 7bce07f192 e6f868572d
commit 8c1c106a4f
92 changed files with 38015 additions and 40668 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1257,7 +1257,6 @@ void ClassOrNamespace::NestedClassInstantiator::instantiate(ClassOrNamespace *en
}
}
nestedClassOrNamespaceInstantiation->_parent = enclosingTemplateClassInstantiation;
instantiate(nestedClassOrNamespace, nestedClassOrNamespaceInstantiation);
enclosingTemplateClassInstantiation->_classOrNamespaces[nestedName] =