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

Merge remote-tracking branch 'origin/2.6'

Browse Source
This commit is contained in:
Eike Ziller
2012-08-23 15:52:15 +02:00
parent 888b7217cb 6a56990302
commit bc67246432
530 changed files with 9207 additions and 33307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/libs/3rdparty/cplusplus/Bind.cpp vendored
View File

@@ -3147,13 +3147,12 @@ void Bind::ensureValidClassName(const Name **name, unsigned sourceLocation)
return;
const QualifiedNameId *qName = (*name)->asQualifiedNameId();
if (qName)
*name = qName->name();
const Name *uqName = qName ? qName->name() : *name;
if (!(*name)->isNameId() && !(*name)->isTemplateNameId()) {
if (!uqName->isNameId() && !uqName->isTemplateNameId()) {
translationUnit()->error(sourceLocation, "expected a class-name");
*name = (*name)->identifier();
*name = uqName->identifier();
if (qName)
*name = control()->qualifiedNameId(qName->base(), *name);
}