diff options
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoainputcontext.mm')
-rw-r--r-- | src/plugins/platforms/cocoa/qcocoainputcontext.mm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoainputcontext.mm b/src/plugins/platforms/cocoa/qcocoainputcontext.mm index 04d6d6b806..9e3d747cd7 100644 --- a/src/plugins/platforms/cocoa/qcocoainputcontext.mm +++ b/src/plugins/platforms/cocoa/qcocoainputcontext.mm @@ -41,6 +41,7 @@ #include "qcocoainputcontext.h" #include "qcocoanativeinterface.h" #include "qcocoawindow.h" +#include "qcocoahelpers.h" #include <Carbon/Carbon.h> @@ -102,7 +103,8 @@ void QCocoaInputContext::reset() if (!mWindow) return; - QNSView *view = static_cast<QCocoaWindow *>(mWindow->handle())->qtView(); + QCocoaWindow *window = static_cast<QCocoaWindow *>(mWindow->handle()); + QNSView *view = qnsview_cast(window->view()); if (!view) return; @@ -131,7 +133,7 @@ void QCocoaInputContext::updateLocale() CFArrayRef languages = (CFArrayRef) TISGetInputSourceProperty(source, kTISPropertyInputSourceLanguages); if (CFArrayGetCount(languages) > 0) { CFStringRef langRef = (CFStringRef)CFArrayGetValueAtIndex(languages, 0); - QString name = QCFString::toQString(langRef); + QString name = QString::fromCFString(langRef); QLocale locale(name); if (m_locale != locale) { m_locale = locale; |