diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-23 21:30:23 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-23 21:30:23 (GMT) |
| commit | f59947c44be1601a0d2a451c18693802533075d7 (patch) | |
| tree | bcf08d01b02b542b99d8e24a9cb88f545794cf0e /src/gui/widgets/qlineedit_p.cpp | |
| parent | bab066cd455ef424ec75753273b1e0d4f3aae710 (diff) | |
| parent | 5cc417be7eb5e43180f92ea2cc46cbf4c4d7395a (diff) | |
| download | Qt-f59947c44be1601a0d2a451c18693802533075d7.zip Qt-f59947c44be1601a0d2a451c18693802533075d7.tar.gz Qt-f59947c44be1601a0d2a451c18693802533075d7.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QLineEdit shows leftovers of edit cursor after clear()
doc: Added indication of default modality value for panels.
doc: Added QScopedArrayPointer and corrected QScopedPointer snippet.
Improve test coverage of QScriptString::toArrayIndex()
QColorDialog::open() freezes the app the *second* time it is used on Mac
doc: Corrected typo.
doc: Removed bad grammar.
doc: Added \obsolete.
doc: Added \since 4.6 to the properties.
doc: Removed some erroneous text.
Diffstat (limited to 'src/gui/widgets/qlineedit_p.cpp')
| -rw-r--r-- | src/gui/widgets/qlineedit_p.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/widgets/qlineedit_p.cpp b/src/gui/widgets/qlineedit_p.cpp index 1aa7a2b..2c76a5c 100644 --- a/src/gui/widgets/qlineedit_p.cpp +++ b/src/gui/widgets/qlineedit_p.cpp @@ -129,7 +129,7 @@ void QLineEditPrivate::_q_editFocusChange(bool e) void QLineEditPrivate::_q_selectionChanged() { Q_Q(QLineEdit); - if (control->preeditAreaText().isEmpty()) { + if (!control->text().isEmpty() && control->preeditAreaText().isEmpty()) { QStyleOptionFrameV2 opt; q->initStyleOption(&opt); bool showCursor = control->hasSelectedText() ? |