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

Merge remote branch 'origin/2.1'

Browse Source 
Conflicts:
	doc/qtcreator.qdoc
	share/qtcreator/templates/mobileapp/app.pro
This commit is contained in:
Oswald Buddenhagen
2010-10-25 11:27:30 +02:00
parent 3b2614c697 49bb852292
commit 35bb61590d
83 changed files with 83178 additions and 77579 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,6 +52,8 @@ private Q_SLOTS:
void forStatement();
void templateSingleline();
void macrosNoSemicolon2();
void renamedNamespace();
void cpp0xFor();
};
struct Line {
@@ -1000,6 +1002,38 @@ void tst_CodeFormatter::macrosNoSemicolon2()
checkIndent(data);
}
void tst_CodeFormatter::renamedNamespace()
{
QList<Line> data;
data
<< Line("namespace X = Y;")
<< Line("void foo()")
<< Line("{")
<< Line(" return;")
<< Line("}")
<< Line("int i;")
;
checkIndent(data);
}
void tst_CodeFormatter::cpp0xFor()
{
QList<Line> data;
data
<< Line("void foo()")
<< Line("{")
<< Line(" vector<int> x = setup();")
<< Line(" for(int p : x) {")
<< Line(" bar(p);")
<< Line(" }")
<< Line("}")
<< Line("void car()")
<< Line("{")
<< Line(" int i;")
;
checkIndent(data);
}
QTEST_APPLESS_MAIN(tst_CodeFormatter)
#include "tst_codeformatter.moc"