1 files changed, 7 insertions, 10 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoawindowsurface.mm b/src/plugins/platforms/cocoa/qcocoawindowsurface.mm
index ecf6879c67..02d5617f96 100644
--- a/src/plugins/platforms/cocoa/qcocoawindowsurface.mm
+++ b/src/plugins/platforms/cocoa/qcocoawindowsurface.mm
@@ -42,7 +42,6 @@
 #include "qcocoawindowsurface.h"
 
 #include <QtCore/qdebug.h>
-
 #include <QtGui/QPainter>
 
 QT_BEGIN_NAMESPACE
@@ -56,17 +55,16 @@ QRect flipedRect(const QRect &sourceRect,int height)
     return flippedRect;
 }
 
-QCocoaWindowSurface::QCocoaWindowSurface(QWidget *window, WId wId)
+QCocoaWindowSurface::QCocoaWindowSurface(QWindow *window, WId wId)
     : QWindowSurface(window)
 {
-    m_cocoaWindow = static_cast<QCocoaWindow *>(window->platformWindow());
+    Q_UNUSED(wId);
+    m_cocoaWindow = static_cast<QCocoaWindow *>(window->handle());
 
     const QRect geo = window->geometry();
     NSRect rect = NSMakeRect(geo.x(),geo.y(),geo.width(),geo.height());
-    m_contentView = [[QNSView alloc] initWithWidget:window];
-    m_cocoaWindow->setContentView(m_contentView);
 
-    m_image = new QImage(window->size(),QImage::Format_ARGB32);
+    m_image = new QImage(window->geometry().size(),QImage::Format_ARGB32);
 }
 
 QCocoaWindowSurface::~QCocoaWindowSurface()
@@ -79,7 +77,7 @@ QPaintDevice *QCocoaWindowSurface::paintDevice()
     return m_image;
 }
 
-void QCocoaWindowSurface::flush(QWidget *widget, const QRegion &region, const QPoint &offset)
+void QCocoaWindowSurface::flush(QWindow *widget, const QRegion &region, const QPoint &offset)
 {
     Q_UNUSED(widget);
     Q_UNUSED(offset);
@@ -87,7 +85,7 @@ void QCocoaWindowSurface::flush(QWidget *widget, const QRegion &region, const QP
     QRect geo = region.boundingRect();
 
     NSRect rect = NSMakeRect(geo.x(), geo.y(), geo.width(), geo.height());
-    [m_contentView displayRect:rect];
+    [m_cocoaWindow->m_windowSurfaceView displayRect:rect];
 }
 
 void QCocoaWindowSurface::resize(const QSize &size)
@@ -96,8 +94,7 @@ void QCocoaWindowSurface::resize(const QSize &size)
     delete m_image;
     m_image = new QImage(size,QImage::Format_ARGB32_Premultiplied);
     NSSize newSize = NSMakeSize(size.width(),size.height());
-    [m_contentView setImage:m_image];
-
+    [m_cocoaWindow->m_windowSurfaceView setImage:m_image];
 }
 
 QT_END_NAMESPACE