diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-08-14 11:35:11 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-08-14 11:35:30 +0200 |
| commit | 809b5e2fc1cc5935c2dd7d63992c7a94dfce4dd8 (patch) | |
| tree | c0f08d106a16f12a89e13550d58d424d0f9cba6a /tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp | |
| parent | dc4e537d4cfe16aaa88b6edd911571317241ab32 (diff) | |
| parent | da7df10b3d5769d1da7851895d27257a0d930012 (diff) | |
Merge remote-tracking branch 'origin/5.3' into 5.4
Change-Id: I2e06c2fcd8aa9d5d090f0568be75272ec82f7b20
Diffstat (limited to 'tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp')
| -rw-r--r-- | tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp b/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp index f8fc4c10da..00aa1dbe10 100644 --- a/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp +++ b/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp @@ -2389,10 +2389,9 @@ void tst_qquicktextedit::positionAt() break; } - qreal xoff; + qreal xoff = 0; switch (horizontalAlignment) { case QQuickTextEdit::AlignLeft: - xoff = 0; break; case QQuickTextEdit::AlignHCenter: xoff = (texteditObject->width() - secondLine.naturalTextWidth()) / 2; @@ -2400,7 +2399,7 @@ void tst_qquicktextedit::positionAt() case QQuickTextEdit::AlignRight: xoff = texteditObject->width() - secondLine.naturalTextWidth(); break; - case QQuickTextEdit::AlignJustify: + default: break; } int pos = texteditObject->positionAt(texteditObject->width()/2, y0); |