diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-22 12:10:15 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-22 12:10:15 (GMT) |
| commit | 3affa6d068b3e78975bf646418057f26daa38f5b (patch) | |
| tree | 3a0ca40631d880e7efb6525439e16b13f5f5ea4f /src | |
| parent | b80af86c2917ab3cdcbeb790c2bd41b11c03f837 (diff) | |
| parent | cc37d494c2c6ef5768e4bc30cad62f24fee033c3 (diff) | |
| download | Qt-3affa6d068b3e78975bf646418057f26daa38f5b.zip Qt-3affa6d068b3e78975bf646418057f26daa38f5b.tar.gz Qt-3affa6d068b3e78975bf646418057f26daa38f5b.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:
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 |