diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-08-29 10:48:03 +0200 |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2011-08-29 12:03:57 +0200 |
| commit | b5dba292c2439488985be0d0c38613a50563a995 (patch) | |
| tree | da356b063c0d3d94757c96c9a38400e572698620 /src/plugins/platforms/cocoa | |
| parent | e35a83b293e6b38f6060895262b5494d36515e6e (diff) | |
Get cocoa plugin compiling after OpenGL refactoring
Change-Id: I9de6de9e633c1355d45c0851c1df94e707b62927
Reviewed-on: http://codereview.qt.nokia.com/3721
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Diffstat (limited to 'src/plugins/platforms/cocoa')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoaintegration.mm | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoanativeinterface.mm | 4 |
2 files changed, 3 insertions, 3 deletions
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 <qwindow.h> #include "qplatformwindow_qpa.h" #include "qsurfaceformat.h" -#include "qplatformglcontext_qpa.h" -#include "qguiglcontext_qpa.h" +#include "qplatformopenglcontext_qpa.h" +#include "qopenglcontext.h" #include <qdebug.h> void *QCocoaNativeInterface::nativeResourceForWindow(const QByteArray &resourceString, QWindow *window) |