From b79fe7e71172dfd15947db9f7cda90abe1e8857e Mon Sep 17 00:00:00 2001
From: Christian Kamm <christian.d.kamm@nokia.com>
Date: Wed, 25 Aug 2010 14:54:45 +0200
Subject: [PATCH] C++: Fix indenting of QML_* macros.
Task-number: QTCREATORBUG-2111
---
src/plugins/cpptools/cppcodeformatter.cpp | 1 +
tests/auto/cplusplus/codeformatter/tst_codeformatter.cpp | 2 ++
2 files changed, 3 insertions(+)
diff --git a/src/plugins/cpptools/cppcodeformatter.cpp b/src/plugins/cpptools/cppcodeformatter.cpp
index 4164010fb9f..591c1f2d163 100644
--- a/src/plugins/cpptools/cppcodeformatter.cpp
+++ b/src/plugins/cpptools/cppcodeformatter.cpp
@@ -678,6 +678,7 @@ bool CodeFormatter::tryDeclaration()
QString tokenText = currentTokenText().toString();
if (tokenText.startsWith(QLatin1String("Q_"))
|| tokenText.startsWith(QLatin1String("QT_"))
+ || tokenText.startsWith(QLatin1String("QML_"))
|| tokenText.startsWith(QLatin1String("QDOC_"))) {
enter(qt_like_macro);
return true;
diff --git a/tests/auto/cplusplus/codeformatter/tst_codeformatter.cpp b/tests/auto/cplusplus/codeformatter/tst_codeformatter.cpp
index fb2ee61b025..c0864498056 100644
--- a/tests/auto/cplusplus/codeformatter/tst_codeformatter.cpp
+++ b/tests/auto/cplusplus/codeformatter/tst_codeformatter.cpp
@@ -299,6 +299,8 @@ void tst_CodeFormatter::macrosNoSemicolon()
<< Line("int i;")
<< Line("Q_BLABLA();")
<< Line("int i;")
+ << Line("QML_DECLARE_TYPE(a, b, c, d)")
+ << Line("int i;")
<< Line("Q_PROPERTY(abc)")
<< Line("QDOC_PROPERTY(abc)")
<< Line("void foo() {")
--
GitLab