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

Merge branch '1.3'

Browse Source 
Conflicts:
	src/plugins/debugger/gdb/gdbengine.cpp
This commit is contained in:
Thorbjørn Lindeijer
2010-02-04 15:09:05 +01:00
parent 2ce1603ccf 5268aaed0d
commit 9b3dd396be
6 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/cplusplus/MatchingText.cpp
View File

@@ -271,7 +271,7 @@ QString MatchingText::insertParagraphSeparator(const QTextCursor &tc) const
// anonymous namespace
return QLatin1String("}");
} else if (token.is(T_CLASS) || token.is(T_STRUCT) || token.is(T_UNION)) {
} else if (token.is(T_CLASS) || token.is(T_STRUCT) || token.is(T_UNION) || token.is(T_ENUM)) {
if (tk[index - 2].is(T_TYPEDEF)) {
// recognized:
// typedef struct {