diff options
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoanativeinterface.mm')
-rw-r--r-- | src/plugins/platforms/cocoa/qcocoanativeinterface.mm | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoanativeinterface.mm b/src/plugins/platforms/cocoa/qcocoanativeinterface.mm index a327750ffd..972230349b 100644 --- a/src/plugins/platforms/cocoa/qcocoanativeinterface.mm +++ b/src/plugins/platforms/cocoa/qcocoanativeinterface.mm @@ -65,6 +65,8 @@ #include <qpa/qplatformprintersupport.h> #endif +#include <QtGui/private/qcoregraphics_p.h> + #include <QtPlatformHeaders/qcocoawindowfunctions.h> #include <AppKit/AppKit.h> @@ -95,7 +97,7 @@ void *QCocoaNativeInterface::nativeResourceForWindow(const QByteArray &resourceS return 0; if (resourceString == "nsview") { - return static_cast<QCocoaWindow *>(window->handle())->m_contentView; + return static_cast<QCocoaWindow *>(window->handle())->m_view; #ifndef QT_NO_OPENGL } else if (resourceString == "nsopenglcontext") { return static_cast<QCocoaWindow *>(window->handle())->currentContext()->nsOpenGLContext(); @@ -124,8 +126,6 @@ QPlatformNativeInterface::NativeResourceForIntegrationFunction QCocoaNativeInter return NativeResourceForIntegrationFunction(QCocoaNativeInterface::qImageToCGImage); if (resource.toLower() == "cgimagetoqimage") return NativeResourceForIntegrationFunction(QCocoaNativeInterface::cgImageToQImage); - if (resource.toLower() == "setwindowcontentview") - return NativeResourceForIntegrationFunction(QCocoaNativeInterface::setWindowContentView); if (resource.toLower() == "registertouchwindow") return NativeResourceForIntegrationFunction(QCocoaNativeInterface::registerTouchWindow); if (resource.toLower() == "setembeddedinforeignview") @@ -282,12 +282,6 @@ QImage QCocoaNativeInterface::cgImageToQImage(CGImageRef image) return qt_mac_toQImage(image); } -void QCocoaNativeInterface::setWindowContentView(QPlatformWindow *window, void *contentView) -{ - QCocoaWindow *cocoaPlatformWindow = static_cast<QCocoaWindow *>(window); - cocoaPlatformWindow->setContentView(reinterpret_cast<NSView *>(contentView)); -} - void QCocoaNativeInterface::setEmbeddedInForeignView(QPlatformWindow *window, bool embedded) { QCocoaWindow *cocoaPlatformWindow = static_cast<QCocoaWindow *>(window); |