diff options
| author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2017-01-12 13:48:29 +0100 |
|---|---|---|
| committer | Johan Helsing <johan.helsing@qt.io> | 2017-01-19 09:21:31 +0000 |
| commit | 7c1f9e78fbc251b48a4093e9c40b64255b3b21e8 (patch) | |
| tree | 209da2b842c86f8c8c264cd2fb8a342043ed40e0 | |
| parent | 52db6d23381269f0806377574d08e36aa05fc31a (diff) | |
Fix build with -no-opengl
Change-Id: I8340a4d2efe4f3d4a9bd5aaedda6db1b55009951
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
| -rw-r--r-- | src/compositor/extensions/qwaylandivisurface.cpp | 2 | ||||
| -rw-r--r-- | src/compositor/wayland_wrapper/qwlclientbuffer.cpp | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/compositor/extensions/qwaylandivisurface.cpp b/src/compositor/extensions/qwaylandivisurface.cpp index 06e12a5ab..7feff17d8 100644 --- a/src/compositor/extensions/qwaylandivisurface.cpp +++ b/src/compositor/extensions/qwaylandivisurface.cpp @@ -37,7 +37,9 @@ #include "qwaylandivisurface.h" #include "qwaylandivisurface_p.h" #include "qwaylandiviapplication_p.h" +#ifdef QT_WAYLAND_COMPOSITOR_QUICK #include "qwaylandivisurfaceintegration_p.h" +#endif #include <QtWaylandCompositor/QWaylandResource> diff --git a/src/compositor/wayland_wrapper/qwlclientbuffer.cpp b/src/compositor/wayland_wrapper/qwlclientbuffer.cpp index d52950388..f1c55f547 100644 --- a/src/compositor/wayland_wrapper/qwlclientbuffer.cpp +++ b/src/compositor/wayland_wrapper/qwlclientbuffer.cpp @@ -114,7 +114,9 @@ QWaylandBufferRef::BufferFormatEgl ClientBuffer::bufferFormatEgl() const SharedMemoryBuffer::SharedMemoryBuffer(wl_resource *bufferResource) : ClientBuffer(bufferResource) +#if QT_CONFIG(opengl) , m_shmTexture(nullptr) +#endif { } |