summaryrefslogtreecommitdiffstats
path: root/src/gui/widgets/qlineedit.cpp
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar@trolltech.com>2009-11-16 12:37:25 (GMT)
committerGunnar Sletta <gunnar@trolltech.com>2009-11-16 12:37:25 (GMT)
commit116af8e05ffae348c8236f02bcc9b642f156d3e8 (patch)
tree97942f4e3e72cc31dd6772a162344683bac46441 /src/gui/widgets/qlineedit.cpp
parentde43f6f89e1344045f0fb5a319a44e5d604d414e (diff)
parent7e1f19c3e3036f166a84dbaa916ec1da1cc818c6 (diff)
downloadQt-116af8e05ffae348c8236f02bcc9b642f156d3e8.zip
Qt-116af8e05ffae348c8236f02bcc9b642f156d3e8.tar.gz
Qt-116af8e05ffae348c8236f02bcc9b642f156d3e8.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6
Diffstat (limited to 'src/gui/widgets/qlineedit.cpp')
-rw-r--r--src/gui/widgets/qlineedit.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/widgets/qlineedit.cpp b/src/gui/widgets/qlineedit.cpp
index f5dbe1c..9372ddd 100644
--- a/src/gui/widgets/qlineedit.cpp
+++ b/src/gui/widgets/qlineedit.cpp
@@ -1594,7 +1594,9 @@ void QLineEdit::keyPressEvent(QKeyEvent *event)
&& !isReadOnly())
{
setEditFocus(true);
+#ifndef Q_OS_SYMBIAN
clear();
+#endif
} else {
event->ignore();
return;
@@ -1651,7 +1653,9 @@ void QLineEdit::inputMethodEvent(QInputMethodEvent *e)
&& hasFocus() && !hasEditFocus()
&& !e->preeditString().isEmpty()) {
setEditFocus(true);
+#ifndef Q_OS_SYMBIAN
selectAll(); // so text is replaced rather than appended to
+#endif
}
#endif