diff options
| author | Eike Ziller <eike.ziller@nokia.com> | 2011-10-17 14:22:32 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@nokia.com> | 2011-10-17 14:22:32 +0200 |
| commit | 8eb8368139b08064bf3340fe1df4ddc74ae6b44d (patch) | |
| tree | 3731efd8103cb1703321eed007574be12475a2ea /tests/auto/qml | |
| parent | 4ea9c2193210d2ce87722085aa4ad7cc3057c405 (diff) | |
| parent | a9eb880353ce6b07bab5b57b0663fbe714066907 (diff) | |
| download | qt-creator-8eb8368139b08064bf3340fe1df4ddc74ae6b44d.tar.gz | |
Merge remote-tracking branch 'origin/2.4'
Conflicts:
qtcreator.pri
src/libs/qmljs/qmljstypedescriptionreader.cpp
tests/auto/qml/qmleditor/qmlcodeformatter/tst_qmlcodeformatter.cpp
Change-Id: Id032187023bb42f259a87545ceeb3c965dd01a32
Diffstat (limited to 'tests/auto/qml')
| -rw-r--r-- | tests/auto/qml/qmleditor/qmlcodeformatter/tst_qmlcodeformatter.cpp | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/tests/auto/qml/qmleditor/qmlcodeformatter/tst_qmlcodeformatter.cpp b/tests/auto/qml/qmleditor/qmlcodeformatter/tst_qmlcodeformatter.cpp index a35c03386d..acfa4608b0 100644 --- a/tests/auto/qml/qmleditor/qmlcodeformatter/tst_qmlcodeformatter.cpp +++ b/tests/auto/qml/qmleditor/qmlcodeformatter/tst_qmlcodeformatter.cpp @@ -95,6 +95,7 @@ private Q_SLOTS: void labelledStatements2(); void labelledStatements3(); void json1(); + void multilineTernaryInProperty(); }; struct Line { @@ -1226,6 +1227,29 @@ void tst_QMLCodeFormatter::json1() checkIndent(data); } +void tst_QMLCodeFormatter::multilineTernaryInProperty() +{ + QList<Line> data; + data << Line("Item {") + << Line(" property int a: 1 ?") + << Line(" 2 :") + << Line(" 3 +") + << Line(" 4") + << Line(" property int a: 1 ? 2") + << Line(" : 3 +") + << Line(" 4") + << Line(" a: 1 ?") + << Line(" 2 :") + << Line(" 3") + << Line(" a: 1 ? 2") + << Line(" : 3 +") + << Line(" 4") + << Line(" ba: 1") + << Line("}") + ; + checkIndent(data); +} + QTEST_APPLESS_MAIN(tst_QMLCodeFormatter) #include "tst_qmlcodeformatter.moc" |