diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-07-06 05:12:47 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-07-06 05:12:47 (GMT) |
| commit | 7369eaf32dd45b6fb4e72c34bee2c9a44c62a5b4 (patch) | |
| tree | 7de360f957ec2915dbd1dc24d095884f217c644a /src | |
| parent | c09f58965e772064ca952892f2e7969082f03855 (diff) | |
| parent | 98bfc8b8db811eb902290dbe87660ce799a44c27 (diff) | |
| download | Qt-7369eaf32dd45b6fb4e72c34bee2c9a44c62a5b4.zip Qt-7369eaf32dd45b6fb4e72c34bee2c9a44c62a5b4.tar.gz Qt-7369eaf32dd45b6fb4e72c34bee2c9a44c62a5b4.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativetextinput.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp index 374f371..c2eea6e 100644 --- a/src/declarative/graphicsitems/qdeclarativetextinput.cpp +++ b/src/declarative/graphicsitems/qdeclarativetextinput.cpp @@ -908,6 +908,7 @@ void QDeclarativeTextInput::keyPressEvent(QKeyEvent* ev) void QDeclarativeTextInput::inputMethodEvent(QInputMethodEvent *ev) { Q_D(QDeclarativeTextInput); + ev->ignore(); inputMethodPreHandler(ev); if (ev->isAccepted()) return; |