diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-07-23 17:43:32 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-07-23 17:43:32 (GMT) |
| commit | 9ec431c161202d9f06f3a7c59181cb0ab523958a (patch) | |
| tree | cbf1b4a23c14821f1c6fb26b64b5950f32279409 /src/gui/text/qtextcontrol.cpp | |
| parent | 1368c210ef9976f68eb9fb1c3e4dc14f4fa4edd2 (diff) | |
| parent | 2410f261eaa13442baa46537202d31ad26d797e7 (diff) | |
| download | Qt-9ec431c161202d9f06f3a7c59181cb0ab523958a.zip Qt-9ec431c161202d9f06f3a7c59181cb0ab523958a.tar.gz Qt-9ec431c161202d9f06f3a7c59181cb0ab523958a.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/gui/text/qtextcontrol.cpp')
| -rw-r--r-- | src/gui/text/qtextcontrol.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gui/text/qtextcontrol.cpp b/src/gui/text/qtextcontrol.cpp index 2a590fd..b2ad686 100644 --- a/src/gui/text/qtextcontrol.cpp +++ b/src/gui/text/qtextcontrol.cpp @@ -1245,8 +1245,7 @@ void QTextControlPrivate::keyPressEvent(QKeyEvent *e) process: { QString text = e->text(); - if (!text.isEmpty() && (text.at(0).isPrint() || text.at(0) == QLatin1Char('\t')) && - ((e->modifiers() & (Qt::ControlModifier | Qt::AltModifier | Qt::MetaModifier)) == Qt::NoModifier)) { + if (!text.isEmpty() && (text.at(0).isPrint() || text.at(0) == QLatin1Char('\t'))) { if (overwriteMode // no need to call deleteChar() if we have a selection, insertText // does it already |