diff options
| author | axis <qt-info@nokia.com> | 2009-05-25 11:26:23 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-05-25 11:26:23 (GMT) |
| commit | de01a7e1e827ee7df035e0b32166db2263712e63 (patch) | |
| tree | 3a5cda42d360c63c027afd80eb2e6715faa72aaa /src/gui/itemviews/qitemdelegate.cpp | |
| parent | 4c06cd950d27ba10d2288d508cbaef4e44abee91 (diff) | |
| parent | 44d992ca150d9448cb7b9114b2bc489b441c7b76 (diff) | |
| download | Qt-de01a7e1e827ee7df035e0b32166db2263712e63.zip Qt-de01a7e1e827ee7df035e0b32166db2263712e63.tar.gz Qt-de01a7e1e827ee7df035e0b32166db2263712e63.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts:
src/corelib/io/qfile.cpp
src/corelib/kernel/qsharedmemory_unix.cpp
src/network/socket/qnativesocketengine_p.h
src/network/socket/qnativesocketengine_unix.cpp
Diffstat (limited to 'src/gui/itemviews/qitemdelegate.cpp')
| -rw-r--r-- | src/gui/itemviews/qitemdelegate.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/itemviews/qitemdelegate.cpp b/src/gui/itemviews/qitemdelegate.cpp index 8469c88..fda6255 100644 --- a/src/gui/itemviews/qitemdelegate.cpp +++ b/src/gui/itemviews/qitemdelegate.cpp @@ -47,6 +47,7 @@ #include <qbrush.h> #include <qlineedit.h> #include <qtextedit.h> +#include <qplaintextedit.h> #include <qpainter.h> #include <qpalette.h> #include <qpoint.h> @@ -1194,7 +1195,7 @@ bool QItemDelegate::eventFilter(QObject *object, QEvent *event) case Qt::Key_Enter: case Qt::Key_Return: #ifndef QT_NO_TEXTEDIT - if (qobject_cast<QTextEdit*>(editor)) + if (qobject_cast<QTextEdit *>(editor) || qobject_cast<QPlainTextEdit *>(editor)) return false; // don't filter enter key events for QTextEdit // We want the editor to be able to process the key press // before committing the data (e.g. so it can do |