diff options
| author | Tasuku Suzuki <tasuku.suzuki@nokia.com> | 2012-02-29 13:32:20 +0900 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-12 21:38:51 +0100 |
| commit | 412dbdf410c765e75c60d1f48143dd6c02a69493 (patch) | |
| tree | 565cfebe0ad28bc378479093ae84e54e464a3764 /src/plugins/platforms/cocoa/qnsview.h | |
| parent | 01e8e9136dfa5d3260de0d318da6aece7214f85a (diff) | |
Input method on Mac
Restore input method implimentation in Qt4
Task-number: QTBUG-23867
Change-Id: I5d405ccc8b0a73c399d992f6474a0cc38d191157
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Diffstat (limited to 'src/plugins/platforms/cocoa/qnsview.h')
| -rw-r--r-- | src/plugins/platforms/cocoa/qnsview.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/platforms/cocoa/qnsview.h b/src/plugins/platforms/cocoa/qnsview.h index 1a1a1cd3b9..b21e9e342f 100644 --- a/src/plugins/platforms/cocoa/qnsview.h +++ b/src/plugins/platforms/cocoa/qnsview.h @@ -51,12 +51,14 @@ QT_BEGIN_NAMESPACE class QCocoaWindow; QT_END_NAMESPACE -@interface QNSView : NSView { +@interface QNSView : NSView <NSTextInput> { CGImageRef m_cgImage; QWindow *m_window; QCocoaWindow *m_platformWindow; Qt::MouseButtons m_buttons; QAccessibleInterface *m_accessibleRoot; + QString m_composingText; + bool m_keyEventsAccepted; QStringList *currentCustomDragTypes; } |