diff options
| author | Andrew den Exter <andrew.den-exter@nokia.com> | 2012-01-06 15:39:51 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-12 09:33:32 +0100 |
| commit | 21e6e0e6aa72ab6051eaadd5fbda29c795ca8c8e (patch) | |
| tree | 61841d2e58eacda6fea1e4e195a48c9af0818b90 /src | |
| parent | f8957414968ab78701b710f35bb25e00dc5cf5af (diff) | |
Fix failing tst_qquicktextinput::horizontalAlignment_RightToLeft test.
How the text is laid out is dependent on the horizontalAlignment so
that needs to be determined before updating the display text and doing
the layout.
Task-number: QTBUG-23485
Change-Id: I1872b1bfc60fd829a0d69c21a19cd3b2b4dc8340
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/quick/items/qquicktextinput.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/quick/items/qquicktextinput.cpp b/src/quick/items/qquicktextinput.cpp index bb15acb29b..7858345198 100644 --- a/src/quick/items/qquicktextinput.cpp +++ b/src/quick/items/qquicktextinput.cpp @@ -2962,7 +2962,6 @@ bool QQuickTextInputPrivate::finishChange(int validateFromState, bool update, bo m_validInput = true; m_textDirty = false; } - updateDisplayText(); if (m_textDirty) { m_textDirty = false; @@ -2971,6 +2970,8 @@ bool QQuickTextInputPrivate::finishChange(int validateFromState, bool update, bo emit q->textChanged(); } + updateDisplayText(); + if (m_validInput != wasValidInput) emit q->acceptableInputChanged(); } |