diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-01-09 09:16:24 +0100 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-01-09 09:16:51 +0100 |
| commit | 7830710e57cbbbc8a2fb37fc97eb99f552ecdd83 (patch) | |
| tree | 3fe141b7921ec3820c1db13fe1827c051e8f5060 /tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp | |
| parent | 0beb478b7f4c50f6b57cdc164ffe8029d2895149 (diff) | |
| parent | d37547add0369d45182271754c0a35032d7de2d3 (diff) | |
Merge branch 'stable' into release
Change-Id: I44631ce9d9a6aba090d01911ff62b56043510c9c
Diffstat (limited to 'tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp')
| -rw-r--r-- | tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp b/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp index ea2ad71bfc..f8332d661d 100644 --- a/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp +++ b/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp @@ -2139,6 +2139,8 @@ void tst_qquicktextedit::positionAt() case QQuickTextEdit::AlignRight: xoff = texteditObject->width() - secondLine.naturalTextWidth(); break; + case QQuickTextEdit::AlignJustify: + break; } int pos = texteditObject->positionAt(texteditObject->width()/2, y0); |