diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-23 09:54:19 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-23 09:54:19 (GMT) |
| commit | cde4ad3db7c673ca8ba5457c12a8b04dfbbf99aa (patch) | |
| tree | b530e5438838731e44805c619003a8efa434371b /src | |
| parent | aeeb83806daaa2ddb4b6c87162c929d61cf1350c (diff) | |
| parent | e34b0cc2766ce403a8d12964039957f45e35e451 (diff) | |
| download | Qt-cde4ad3db7c673ca8ba5457c12a8b04dfbbf99aa.zip Qt-cde4ad3db7c673ca8ba5457c12a8b04dfbbf99aa.tar.gz Qt-cde4ad3db7c673ca8ba5457c12a8b04dfbbf99aa.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:
tst_qlineedit: add contains(QT_CONFIG,qt3support) to the .pro file to make it compile
Fix regression: auto completion text cursor problem in Q3FileDialog
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/widgets/qlineedit.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/gui/widgets/qlineedit.cpp b/src/gui/widgets/qlineedit.cpp index 2d2df92..f041a36 100644 --- a/src/gui/widgets/qlineedit.cpp +++ b/src/gui/widgets/qlineedit.cpp @@ -738,8 +738,14 @@ bool QLineEdit::validateAndSet(const QString &newText, int newPos, setText(oldText); return false; } - setCursorPosition(newPos); - setSelection(qMin(newMarkAnchor, newMarkDrag), qAbs(newMarkAnchor - newMarkDrag)); + int selstart = qMin(newMarkAnchor, newMarkDrag); + int sellength = qAbs(newMarkAnchor - newMarkDrag); + if (selstart == newPos) { + selstart = qMax(newMarkAnchor, newMarkDrag); + sellength = -sellength; + } + //setSelection also set the position + setSelection(selstart, sellength); return true; } #endif //QT3_SUPPORT |