1 files changed, 14 insertions, 9 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.mm b/src/plugins/platforms/cocoa/qcocoaintegration.mm
index 086f7b62e9..a3cda6bbee 100644
--- a/src/plugins/platforms/cocoa/qcocoaintegration.mm
+++ b/src/plugins/platforms/cocoa/qcocoaintegration.mm
@@ -44,10 +44,9 @@
 #include "qcocoawindow.h"
 #include "qcocoawindowsurface.h"
 #include "qcocoaeventloopintegration.h"
+#include "qcocoanativeinterface.h"
 
-#include "qcoretextfontdatabase.h"
-
-#include <QtGui/QApplication>
+#include "qbasicunixfontdatabase.h"
 
 #include <private/qpixmap_raster_p.h>
 
@@ -74,7 +73,7 @@ QCocoaScreen::~QCocoaScreen()
 }
 
 QCocoaIntegration::QCocoaIntegration()
-    : mFontDb(new QCoreTextFontDatabase())
+    : mFontDb(new QBasicUnixFontDatabase())
 {
     mPool = new QCocoaAutoReleasePool;
 
@@ -98,6 +97,7 @@ bool QCocoaIntegration::hasCapability(QPlatformIntegration::Capability cap) cons
 {
     switch (cap) {
     case ThreadedPixmaps: return true;
+    case OpenGL : return true;
     default: return QPlatformIntegration::hasCapability(cap);
     }
 }
@@ -109,15 +109,14 @@ QPixmapData *QCocoaIntegration::createPixmapData(QPixmapData::PixelType type) co
     return new QRasterPixmapData(type);
 }
 
-QPlatformWindow *QCocoaIntegration::createPlatformWindow(QWidget *widget, WId winId) const
+QPlatformWindow *QCocoaIntegration::createPlatformWindow(QWindow *window) const
 {
-    Q_UNUSED(winId);
-    return new QCocoaWindow(widget);
+    return new QCocoaWindow(window);
 }
 
-QWindowSurface *QCocoaIntegration::createWindowSurface(QWidget *widget, WId winId) const
+QWindowSurface *QCocoaIntegration::createWindowSurface(QWindow *window, WId winId) const
 {
-    return new QCocoaWindowSurface(widget,winId);
+    return new QCocoaWindowSurface(window, winId);
 }
 
 QPlatformFontDatabase *QCocoaIntegration::fontDatabase() const
@@ -129,4 +128,10 @@ QPlatformEventLoopIntegration *QCocoaIntegration::createEventLoopIntegration() c
 {
     return new QCocoaEventLoopIntegration();
 }
+
+QPlatformNativeInterface *QCocoaIntegration::nativeInterface() const
+{
+    return new QCocoaNativeInterface();
+}
+
 QT_END_NAMESPACE