summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2009-08-12 07:59:17 (GMT)
committeraxis <qt-info@nokia.com>2009-08-12 08:59:35 (GMT)
commit9e03643608527e9ea567b186c7b9209a52908d27 (patch)
tree559787488874dcef396ea2441a2bc70444c1bdda /src
parentba62482f69385ba929384e0402135891c77eddcb (diff)
downloadQt-9e03643608527e9ea567b186c7b9209a52908d27.zip
Qt-9e03643608527e9ea567b186c7b9209a52908d27.tar.gz
Qt-9e03643608527e9ea567b186c7b9209a52908d27.tar.bz2
Redid patch that was lost during merge with 4.6.
See commit 203b2b2c611e2 for details.
Diffstat (limited to 'src')
-rw-r--r--src/gui/widgets/qlineedit_p.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/widgets/qlineedit_p.h b/src/gui/widgets/qlineedit_p.h
index b21820c..f1263c6 100644
--- a/src/gui/widgets/qlineedit_p.h
+++ b/src/gui/widgets/qlineedit_p.h
@@ -101,7 +101,7 @@ public:
inline bool shouldEnableInputMethod() const
{
- return !control->isReadOnly() && (control->echoMode() == QLineEdit::Normal || control->echoMode() == QLineEdit::PasswordEchoOnEdit);
+ return !control->isReadOnly();
}
QPoint tripleClick;