From b5dba292c2439488985be0d0c38613a50563a995 Mon Sep 17 00:00:00 2001 From: Gunnar Sletta Date: Mon, 29 Aug 2011 10:48:03 +0200 Subject: Get cocoa plugin compiling after OpenGL refactoring MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I9de6de9e633c1355d45c0851c1df94e707b62927 Reviewed-on: http://codereview.qt.nokia.com/3721 Reviewed-by: Qt Sanity Bot Reviewed-by: Morten Johan Sørvig --- src/plugins/platforms/cocoa/qcocoaintegration.mm | 2 +- src/plugins/platforms/cocoa/qcocoanativeinterface.mm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/plugins/platforms/cocoa') diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.mm b/src/plugins/platforms/cocoa/qcocoaintegration.mm index af6cad2da0..ace4527d97 100644 --- a/src/plugins/platforms/cocoa/qcocoaintegration.mm +++ b/src/plugins/platforms/cocoa/qcocoaintegration.mm @@ -115,7 +115,7 @@ QPlatformWindow *QCocoaIntegration::createPlatformWindow(QWindow *window) const return new QCocoaWindow(window); } -QPlatformOpenGLContext *QCocoaIntegration::createPlatformGLContext(QOpenGLContext *context) const +QPlatformOpenGLContext *QCocoaIntegration::createPlatformOpenGLContext(QOpenGLContext *context) const { return new QCocoaGLContext(context->format(), context->shareHandle()); } diff --git a/src/plugins/platforms/cocoa/qcocoanativeinterface.mm b/src/plugins/platforms/cocoa/qcocoanativeinterface.mm index 28e3af19b6..c6aa0d39e6 100644 --- a/src/plugins/platforms/cocoa/qcocoanativeinterface.mm +++ b/src/plugins/platforms/cocoa/qcocoanativeinterface.mm @@ -46,8 +46,8 @@ #include #include "qplatformwindow_qpa.h" #include "qsurfaceformat.h" -#include "qplatformglcontext_qpa.h" -#include "qguiglcontext_qpa.h" +#include "qplatformopenglcontext_qpa.h" +#include "qopenglcontext.h" #include void *QCocoaNativeInterface::nativeResourceForWindow(const QByteArray &resourceString, QWindow *window) -- cgit v1.2.3