diff options
| author | Sergio Martins <sergio.martins@kdab.com> | 2014-02-10 15:11:38 +0000 |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@digia.com> | 2014-06-30 10:01:13 +0200 |
| commit | a12ba316161b23b4ae147c59a9fbd501a7921ce4 (patch) | |
| tree | 8c2c66ef31cf58f4ee8b51cada937884d6e60172 /src/plugins/platforms/cocoa/qcocoaintegration.mm | |
| parent | 90a68926f311ac5bb8f7c53ac8370f9ff7f12c08 (diff) | |
OS X: Fix build with QT_NO_OPENGL
Task-number: QTBUG-31151
Change-Id: I7ed8117ae05ba0eebaf85731c7fdd2bb51d6ed04
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoaintegration.mm')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoaintegration.mm | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.mm b/src/plugins/platforms/cocoa/qcocoaintegration.mm index b22bc71e30..d04dc958e1 100644 --- a/src/plugins/platforms/cocoa/qcocoaintegration.mm +++ b/src/plugins/platforms/cocoa/qcocoaintegration.mm @@ -401,9 +401,11 @@ bool QCocoaIntegration::hasCapability(QPlatformIntegration::Capability cap) cons { switch (cap) { case ThreadedPixmaps: +#ifndef QT_NO_OPENGL case OpenGL: case ThreadedOpenGL: case BufferQueueingOpenGL: +#endif case WindowMasks: case MultipleWindows: case ForeignWindows: @@ -420,6 +422,7 @@ QPlatformWindow *QCocoaIntegration::createPlatformWindow(QWindow *window) const return new QCocoaWindow(window); } +#ifndef QT_NO_OPENGL QPlatformOpenGLContext *QCocoaIntegration::createPlatformOpenGLContext(QOpenGLContext *context) const { QCocoaGLContext *glContext = new QCocoaGLContext(context->format(), @@ -428,6 +431,7 @@ QPlatformOpenGLContext *QCocoaIntegration::createPlatformOpenGLContext(QOpenGLCo context->setNativeHandle(glContext->nativeHandle()); return glContext; } +#endif QPlatformBackingStore *QCocoaIntegration::createPlatformBackingStore(QWindow *window) const { |