diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-22 11:36:00 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-22 11:36:01 +0100 |
| commit | f3bf2efcbd4759dd7be96d9a3fc4719f01d472ba (patch) | |
| tree | d28cc1306fd42b1e0bd55b7949fca49db8641ab8 /src/plugins/platforms/cocoa/qnsview.mm | |
| parent | 2d8028d696a86102a7753f9d59fb41f4170181a8 (diff) | |
| parent | 9eba69d7f914e4823e94699c5653df5ad279eb46 (diff) | |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: I885821d93a41b0caad627bfc16aa8eed21d2f5b9
Diffstat (limited to 'src/plugins/platforms/cocoa/qnsview.mm')
| -rw-r--r-- | src/plugins/platforms/cocoa/qnsview.mm | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/plugins/platforms/cocoa/qnsview.mm b/src/plugins/platforms/cocoa/qnsview.mm index f7b129aea1..ecb6c127aa 100644 --- a/src/plugins/platforms/cocoa/qnsview.mm +++ b/src/plugins/platforms/cocoa/qnsview.mm @@ -1346,6 +1346,11 @@ static QTabletEvent::TabletDevice wacomTabletDevice(NSEvent *theEvent) { Q_UNUSED(replacementRange) + if (m_sendKeyEvent && m_composingText.isEmpty()) { + // don't send input method events for simple text input (let handleKeyEvent send key events instead) + return; + } + QString commitString; if ([aString length]) { if ([aString isKindOfClass:[NSAttributedString class]]) { |