diff options
author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-07-02 17:00:49 +0200 |
---|---|---|
committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-07-03 00:21:38 +0200 |
commit | 39d99c714bb87bd39e92d85fb1f46c52eb9f8d33 (patch) | |
tree | 689d0f831d24921c649b4b8714486fe35b3f7bed /src/plugins | |
parent | dd34ac5c3450b93296480c766b092d37c6f87a36 (diff) |
Fix no-OpenGL build after introducing QOpenGLContext platform interface
Change-Id: I355f43c200adb3a12e71e0b02aa10060672bb9e4
Reviewed-by: Nodir Temirkhodjaev <nodir.temir@gmail.com>
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'src/plugins')
4 files changed, 12 insertions, 3 deletions
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: diff --git a/src/plugins/platforms/eglfs/api/qeglfsintegration_p.h b/src/plugins/platforms/eglfs/api/qeglfsintegration_p.h index baf9baadda..babcbfaaa4 100644 --- a/src/plugins/platforms/eglfs/api/qeglfsintegration_p.h +++ b/src/plugins/platforms/eglfs/api/qeglfsintegration_p.h @@ -68,7 +68,9 @@ class QFbVtHandler; class QEvdevKeyboardManager; class Q_EGLFS_EXPORT QEglFSIntegration : public QPlatformIntegration, public QPlatformNativeInterface +#ifndef QT_NO_OPENGL , public QPlatformInterface::Private::QEGLIntegration +#endif { public: QEglFSIntegration(); diff --git a/src/plugins/platforms/windows/qwindowsintegration.h b/src/plugins/platforms/windows/qwindowsintegration.h index 348da5c58c..207e018ca8 100644 --- a/src/plugins/platforms/windows/qwindowsintegration.h +++ b/src/plugins/platforms/windows/qwindowsintegration.h @@ -54,7 +54,10 @@ struct QWindowsWindowData; class QWindowsWindow; class QWindowsStaticOpenGLContext; -class QWindowsIntegration : public QPlatformIntegration, public QPlatformInterface::Private::QWindowsGLIntegration +class QWindowsIntegration : public QPlatformIntegration +#ifndef QT_NO_OPENGL + , public QPlatformInterface::Private::QWindowsGLIntegration +#endif { Q_DISABLE_COPY_MOVE(QWindowsIntegration) public: diff --git a/src/plugins/platforms/xcb/qxcbintegration.h b/src/plugins/platforms/xcb/qxcbintegration.h index 37d2db394c..013555c6e0 100644 --- a/src/plugins/platforms/xcb/qxcbintegration.h +++ b/src/plugins/platforms/xcb/qxcbintegration.h @@ -56,8 +56,10 @@ class QAbstractEventDispatcher; class QXcbNativeInterface; class Q_XCB_EXPORT QXcbIntegration : public QPlatformIntegration +#ifndef QT_NO_OPENGL , public QPlatformInterface::Private::QGLXIntegration , public QPlatformInterface::Private::QEGLIntegration +#endif { public: QXcbIntegration(const QStringList ¶meters, int &argc, char **argv); |