From 39d99c714bb87bd39e92d85fb1f46c52eb9f8d33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Thu, 2 Jul 2020 17:00:49 +0200 Subject: Fix no-OpenGL build after introducing QOpenGLContext platform interface Change-Id: I355f43c200adb3a12e71e0b02aa10060672bb9e4 Reviewed-by: Nodir Temirkhodjaev Reviewed-by: Laszlo Agocs --- src/plugins/platforms/cocoa/qcocoaintegration.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/plugins/platforms/cocoa/qcocoaintegration.h') diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.h b/src/plugins/platforms/cocoa/qcocoaintegration.h index f82e0050ae..f8b9e9fc12 100644 --- a/src/plugins/platforms/cocoa/qcocoaintegration.h +++ b/src/plugins/platforms/cocoa/qcocoaintegration.h @@ -62,8 +62,10 @@ Q_FORWARD_DECLARE_OBJC_CLASS(NSToolbar); QT_BEGIN_NAMESPACE -class QCocoaIntegration : public QObject, public QPlatformIntegration, - public QPlatformInterface::Private::QCocoaGLIntegration +class QCocoaIntegration : public QObject, public QPlatformIntegration +#ifndef QT_NO_OPENGL + , public QPlatformInterface::Private::QCocoaGLIntegration +#endif { Q_OBJECT public: -- cgit v1.2.3