diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-29 10:03:02 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-29 10:03:02 (GMT) |
| commit | 398c74022e9f24bc091348721148f3c1c53b6229 (patch) | |
| tree | e9396eab797d7199ad485cdb4d83e3bc37085078 /src | |
| parent | 85d4d3dececc3a51082273211170c524de15414f (diff) | |
| parent | d198186cdb18bbb9428ca51e8771cc4fd9563452 (diff) | |
| download | Qt-398c74022e9f24bc091348721148f3c1c53b6229.zip Qt-398c74022e9f24bc091348721148f3c1c53b6229.tar.gz Qt-398c74022e9f24bc091348721148f3c1c53b6229.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Layout direction change by key should change alignment of QLineEdit
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/widgets/qlineedit.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gui/widgets/qlineedit.cpp b/src/gui/widgets/qlineedit.cpp index f041a36..6e8daee 100644 --- a/src/gui/widgets/qlineedit.cpp +++ b/src/gui/widgets/qlineedit.cpp @@ -1665,8 +1665,11 @@ void QLineEdit::keyPressEvent(QKeyEvent *event) } #endif d->control->processKeyEvent(event); - if (event->isAccepted()) + if (event->isAccepted()) { + if (layoutDirection() != d->control->layoutDirection()) + setLayoutDirection(d->control->layoutDirection()); d->control->setCursorBlinkPeriod(0); + } } /*! |