diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-23 07:17:50 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-23 07:17:50 (GMT) |
| commit | d1669a04e409c76d1feb9e7068d30d7b580ef467 (patch) | |
| tree | 2ff822afde5b473da1f02f137843e5d12a9ec54b /src | |
| parent | b09dc82015fea752db1b203b8ecf3a1e1b04789d (diff) | |
| parent | 3affa6d068b3e78975bf646418057f26daa38f5b (diff) | |
| download | Qt-d1669a04e409c76d1feb9e7068d30d7b580ef467.zip Qt-d1669a04e409c76d1feb9e7068d30d7b580ef467.tar.gz Qt-d1669a04e409c76d1feb9e7068d30d7b580ef467.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 |