diff options
| author | Paul Olav Tvete <paul.tvete@qt.io> | 2016-11-10 12:48:57 +0100 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@qt.io> | 2016-11-10 12:50:29 +0100 |
| commit | 2744dfbb87c4b5d9ef766b1ac49ec0ab983c7b9f (patch) | |
| tree | 580dc1c0f4e35edbcceb41a537170766007dcc48 /src/plugins/platforms/wayland/qwaylandnativeinterface.cpp | |
| parent | fec8cd87e0555e763b8ef405a34afbcfaa9dd9f2 (diff) | |
| parent | 27490e8dde407af3b1dd6e647c0dc994ee8ec056 (diff) | |
Merge remote-tracking branch 'qt/5.7' into 5.8
Change-Id: Ibfe6fe6ed983b537d55544883b7dc75e5cc3fc37
Diffstat (limited to 'src/plugins/platforms/wayland/qwaylandnativeinterface.cpp')
| -rw-r--r-- | src/plugins/platforms/wayland/qwaylandnativeinterface.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/platforms/wayland/qwaylandnativeinterface.cpp b/src/plugins/platforms/wayland/qwaylandnativeinterface.cpp index 4a79fb5ab55..52c61eec13e 100644 --- a/src/plugins/platforms/wayland/qwaylandnativeinterface.cpp +++ b/src/plugins/platforms/wayland/qwaylandnativeinterface.cpp @@ -116,6 +116,7 @@ void *QWaylandNativeInterface::nativeResourceForScreen(const QByteArray &resourc return nullptr; } +#ifndef QT_NO_OPENGL void *QWaylandNativeInterface::nativeResourceForContext(const QByteArray &resource, QOpenGLContext *context) { #ifdef QT_WAYLAND_GL_SUPPORT @@ -133,6 +134,7 @@ void *QWaylandNativeInterface::nativeResourceForContext(const QByteArray &resour return nullptr; } +#endif // QT_NO_OPENGL QVariantMap QWaylandNativeInterface::windowProperties(QPlatformWindow *window) const { |