diff options
| author | Jing Bai <jing.bai@digia.com> | 2013-01-15 19:04:10 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-21 11:15:20 +0100 |
| commit | 8c2284e811d6a1e5d1d5f0703f127e66800baf78 (patch) | |
| tree | 54636ac29412d8ceaacacdab831065808a468e00 /src/gui/kernel/qkeymapper_mac.cpp | |
| parent | 32426500bc9126de7322ce666e1fae4c0848731f (diff) | |
To support QT_NO_IM on Linux/Windows/Mac
Fix compilation issue when QT_NO_IM is defined.
Also fixed references in tests. But fixing
plugins/examples seem not necessary at this point.
Task-number: QTBUG-26109
Change-Id: I2067051951616012117efa6716640cbf198fdb2a
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Diffstat (limited to 'src/gui/kernel/qkeymapper_mac.cpp')
| -rw-r--r-- | src/gui/kernel/qkeymapper_mac.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/kernel/qkeymapper_mac.cpp b/src/gui/kernel/qkeymapper_mac.cpp index ed57d75d69..d09adedc18 100644 --- a/src/gui/kernel/qkeymapper_mac.cpp +++ b/src/gui/kernel/qkeymapper_mac.cpp @@ -739,7 +739,7 @@ bool QKeyMapperPrivate::translateKeyEvent(QWidget *widget, EventHandlerCallRef e qt_mac_send_modifiers_changed(modifiers, widget); return true; } - +#ifndef QT_NO_IM QInputContext *currentContext = qApp->inputContext(); if (currentContext && currentContext->isComposing()) { if (ekind == kEventRawKeyDown) { @@ -756,7 +756,7 @@ bool QKeyMapperPrivate::translateKeyEvent(QWidget *widget, EventHandlerCallRef e if (context) context->setLastKeydownEvent(0); } - +#endif //get modifiers Qt::KeyboardModifiers modifiers; int qtKey; |