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/qcocoahelpers.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/qcocoahelpers.h')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoahelpers.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoahelpers.h b/src/plugins/platforms/cocoa/qcocoahelpers.h index 3e3e8fa507..e5fe664731 100644 --- a/src/plugins/platforms/cocoa/qcocoahelpers.h +++ b/src/plugins/platforms/cocoa/qcocoahelpers.h @@ -74,6 +74,8 @@ NSImage *qt_mac_create_nsimage(const QPixmap &pm); NSSize qt_mac_toNSSize(const QSize &qtSize); +QColor qt_mac_toQColor(const NSColor *color); + QChar qt_mac_qtKey2CocoaKey(Qt::Key key); Qt::Key qt_mac_cocoaKey2QtKey(QChar keyCode); |