Merge branch '1.0.0'

Conflicts:
	tests/auto/cplusplus/shared/shared.pri
	tests/auto/cplusplus/shared/shared.pro
This commit is contained in:
con
2009-02-09 10:54:36 +01:00
15 changed files with 55 additions and 55 deletions

View File

@@ -92,6 +92,8 @@ QString TypePrettyPrinter::operator()(const FullySpecifiedType &type, const QStr
if (ch.isLetterOrNumber() || ch == QLatin1Char('_'))
text += QLatin1Char(' ');
text += _name;
} else if (text.isEmpty()) {
text = name;
}
(void) switchName(previousName);
return text;