diff options
| author | Tasuku Suzuki <tasuku.suzuki@nokia.com> | 2012-03-19 11:04:26 +0900 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-23 09:48:04 +0100 |
| commit | 68f44a7f98de4d60c39c9374ecd470eab74b22dd (patch) | |
| tree | 651468b10207b5f251f11a27c4823e85ef3ca716 /src/plugins/platforms/cocoa/qcocoainputcontext.h | |
| parent | fd379ae7d3952cf423f87afbaed943d10e790432 (diff) | |
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>
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoainputcontext.h')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoainputcontext.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoainputcontext.h b/src/plugins/platforms/cocoa/qcocoainputcontext.h index 172c87e2dc..1fda29209d 100644 --- a/src/plugins/platforms/cocoa/qcocoainputcontext.h +++ b/src/plugins/platforms/cocoa/qcocoainputcontext.h @@ -59,7 +59,8 @@ public: virtual void reset(); private Q_SLOTS: - void inputItemChanged(); + void connectSignals(); + void focusObjectChanged(QObject *focusObject); private: QPointer<QWindow> mWindow; |