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

C++: Fix indenting of QML_* macros.

Browse Source 
Task-number: QTCREATORBUG-2111
This commit is contained in:
Christian Kamm
2010-08-25 14:54:45 +02:00
parent 7a8c07a1f8
commit b79fe7e711
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/cpptools/cppcodeformatter.cpp
View File

@@ -678,6 +678,7 @@ bool CodeFormatter::tryDeclaration()
QString tokenText = currentTokenText().toString(); QString tokenText = currentTokenText().toString();
if (tokenText.startsWith(QLatin1String("Q_")) if (tokenText.startsWith(QLatin1String("Q_"))
|| tokenText.startsWith(QLatin1String("QT_")) || tokenText.startsWith(QLatin1String("QT_"))
|| tokenText.startsWith(QLatin1String("QML_"))
|| tokenText.startsWith(QLatin1String("QDOC_"))) { || tokenText.startsWith(QLatin1String("QDOC_"))) {
enter(qt_like_macro); enter(qt_like_macro);
return true; return true;

2
tests/auto/cplusplus/codeformatter/tst_codeformatter.cpp
View File

@@ -299,6 +299,8 @@ void tst_CodeFormatter::macrosNoSemicolon()
<< Line("int i;") << Line("int i;")
<< Line("Q_BLABLA();") << Line("Q_BLABLA();")
<< Line("int i;") << Line("int i;")
<< Line("QML_DECLARE_TYPE(a, b, c, d)")
<< Line("int i;")
<< Line("Q_PROPERTY(abc)") << Line("Q_PROPERTY(abc)")
<< Line("QDOC_PROPERTY(abc)") << Line("QDOC_PROPERTY(abc)")
<< Line("void foo() {") << Line("void foo() {")