summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Alpert <alan.alpert@nokia.com>2009-07-07 07:45:56 (GMT)
committerAlan Alpert <alan.alpert@nokia.com>2009-07-07 07:45:56 (GMT)
commit043a9b2eb3dd346126cf13817b67ed0790a72f7a (patch)
tree16aa670398f45f8a069164bf09a60b2a0e935097
parent22ff3df15cc3143e6410b02f39b967d1d76cf2d6 (diff)
downloadQt-043a9b2eb3dd346126cf13817b67ed0790a72f7a.zip
Qt-043a9b2eb3dd346126cf13817b67ed0790a72f7a.tar.gz
Qt-043a9b2eb3dd346126cf13817b67ed0790a72f7a.tar.bz2
Manually integrate 099a32d121 to QLineControl
This change to QLineEdit didn't merge, as it needs to be applied to QLineControl in this case.
-rw-r--r--src/gui/widgets/qlinecontrol.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/widgets/qlinecontrol.cpp b/src/gui/widgets/qlinecontrol.cpp
index b762a00..08574b5 100644
--- a/src/gui/widgets/qlinecontrol.cpp
+++ b/src/gui/widgets/qlinecontrol.cpp
@@ -1685,7 +1685,8 @@ void QLineControl::processKeyEvent(QKeyEvent* event)
if (unknown && !isReadOnly()) {
QString t = event->text();
- if (!t.isEmpty() && t.at(0).isPrint()) {
+ if (!t.isEmpty() && t.at(0).isPrint() &&
+ ((event->modifiers() & (Qt::ControlModifier | Qt::AltModifier | Qt::MetaModifier)) == Qt::NoModifier)) {
insert(t);
#ifndef QT_NO_COMPLETER
complete(event->key());