Commit Graph

28 Commits

Author SHA1 Message Date
Oswald Buddenhagen
35bb61590d Merge remote branch 'origin/2.1'
Conflicts:
	doc/qtcreator.qdoc
	share/qtcreator/templates/mobileapp/app.pro
2010-10-25 11:27:30 +02:00
Bill King
524a9ac4a8 tests: more test project cleanup 2010-10-21 14:49:58 +10:00
Christian Kamm
e7a6bae170 C++ indenter: Add autotest for C++0x 'for' statement.
Reviewed-by: trustme
2010-10-20 10:51:13 +02:00
Bill King
d95f3324c7 tests: remove unnecessary TARGET = tst_$$TARGET
"CONFIG += testcase" does this for us, and is the proper way to do this.
2010-10-20 15:03:01 +10:00
Christian Kamm
5ac981a0ac C++ indenter: Fix indentation after namespace aliases.
Task-number: QTCREATORBUG-2574
Reviewed-by: Roberto Raggi
2010-10-19 12:49:43 +02:00
Christian Kamm
7e3294a8ce C++ indenter: Don't get confused on 'for (a in b)'.
Reviewed-by: Roberto Raggi
Reviewed-by: Erik Verbruggen
(cherry picked from commit c2d890f65e)
2010-10-08 13:09:26 +02:00
Christian Kamm
ed6585c312 C++ indenter: Add another ObjC test. 2010-10-06 15:39:53 +02:00
Christian Kamm
c2d890f65e C++ indenter: Don't get confused on 'for (a in b)'.
Reviewed-by: Roberto Raggi
Reviewed-by: Erik Verbruggen
2010-10-06 15:35:01 +02:00
Christian Kamm
17e0886c69 C++ indenter: Fix error recovery in function definitions.
Task-number: QTCREATORBUG-1517
2010-09-24 15:58:23 +02:00
Christian Kamm
d7bf4f515d C++ indenter: Fix indentation if template and class appear on one line.
Task-number: QTCREATORBUG-2427
2010-09-24 15:08:54 +02:00
Christian Kamm
be563abf68 C++ indenter: Simplify debugging by making dump() more verbose. 2010-09-24 15:08:54 +02:00
Christian Kamm
e5cbb56fe7 C++ indenter: Fix for statement indentation and add test. 2010-09-15 11:16:25 +02:00
Christian Kamm
642b6fb0d3 C++ indenter: Separate indent into logical indent and padding. 2010-09-13 12:38:34 +02:00
Christian Kamm
1862282bee C++ indenter: Fix nested array/struct initializers. 2010-08-31 09:45:01 +02:00
Christian Kamm
b79fe7e711 C++: Fix indenting of QML_* macros.
Task-number: QTCREATORBUG-2111
2010-08-25 14:55:16 +02:00
Christian Kamm
27026af2e3 C++ indenter: Fix indent of block statements in substatement blocks.
Task-number: QTCREATORBUG-1919
2010-07-28 12:39:27 +02:00
Christian Kamm
d292eca5f6 C++ indenter: Indent member initializer lists correctly.
Without requiring ',' to be an electric character.

Task-number: QTCREATORBUG-1866
Reviewed-by: Roberto Raggi
2010-07-16 10:30:14 +02:00
Christian Kamm
1a61ae01cb C++ indenter: Respect user indent with stream operators.
Reviewed-by: Erik Verbruggen
2010-07-15 16:15:09 +02:00
Bill King
f823c4810e Add "make check" support to testcase makefiles. 2010-07-13 11:59:37 +10:00
Christian Kamm
c8fae11222 C++ indenter: Fix for extending if conditions.
Task-number: QTCREATORBUG-1825
2010-07-08 13:08:03 +02:00
Christian Kamm
486b23b8ef C++ indenter: Don't add continuation indent after function return type.
Task-number: QTCREATORBUG-1816
2010-07-08 08:48:36 +02:00
Christian Kamm
6078b36c9c C++ indenter: Enable class, struct, enum, namespace, using in functions.
Fixes incorrect indentation we got previously when they were used in a
statement context.
2010-07-08 08:36:34 +02:00
Christian Kamm
74ed3e8a11 C++ indenter: Add more functions to manage the indenter state. 2010-07-06 14:53:54 +02:00
Christian Kamm
bf7613d2e7 C++ indenter: Add special case rule for indenting enums.
So you now get
enum A { a = 2,
         b = 3,
       };
2010-07-06 13:54:21 +02:00
Christian Kamm
8dbbf9be92 C++ indenter: Require explicit state update requests.
This will allow much faster indenting of selected areas as the state
doesn't have to be checked again for every line.
2010-07-06 13:52:49 +02:00
Christian Kamm
793ef6a694 C++ indenter: Fix 'else' indentation in GNU style. 2010-07-06 09:44:35 +02:00
Christian Kamm
19db6c9826 C++ indenter: Make building custom styles easier, fix style issues.
Keep more information by using enter() instead of turnInto() when moving
from a *_start to *_open.
2010-07-05 13:49:12 +02:00
Christian Kamm
88f2e340bd C++: Introduce the new CodeFormatter.
Done-with: Erik Verbruggen
2010-07-02 16:13:12 +02:00