Check if Qt::ImEnabled is true before handling im events on Mac
authorTasuku Suzuki <tasuku.suzuki@nokia.com>
Mon, 19 Mar 2012 02:04:26 +0000 (11:04 +0900)
committerQt by Nokia <qt-info@nokia.com>
Fri, 23 Mar 2012 08:48:04 +0000 (09:48 +0100)
commit68f44a7f98de4d60c39c9374ecd470eab74b22dd
tree651468b10207b5f251f11a27c4823e85ef3ca716
parentfd379ae7d3952cf423f87afbaed943d10e790432
Check if Qt::ImEnabled is true before handling im events on Mac

Key events were not sent to items on graphics view after the change
412dbdf410c765e75c60d1f48143dd6c02a69493. This is because the change
only checks if QGuiApplication::focusObject() exists. Qt::ImEnabled
needs to be checked too.

Change-Id: I2a78af717a7a1a5d84fbc8b521253bdc25b43286
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
src/plugins/platforms/cocoa/qcocoainputcontext.h
src/plugins/platforms/cocoa/qcocoainputcontext.mm
src/plugins/platforms/cocoa/qnsview.mm