Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline

This commit is contained in:
hjk
2009-02-16 09:59:47 +01:00

View File

@@ -158,8 +158,10 @@ static QString buildHelpId(const FullySpecifiedType &type,
scope = e->scope(); scope = e->scope();
} else if (const NamedType *t = type->asNamedType()) { } else if (const NamedType *t = type->asNamedType()) {
name = t->name(); name = t->name();
} else if (const Declaration *d = symbol->asDeclaration()) { } else if (symbol && symbol->isDeclaration()) {
if (d->scope() && d->scope()->owner()->isEnum()) { const Declaration *d = symbol->asDeclaration();
if (d->scope() && d->scope()->isEnumScope()) {
name = d->name(); name = d->name();
scope = d->scope(); scope = d->scope();
} }