summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Klokkhammer Helsing <johan.helsing@qt.io>2019-05-29 11:56:04 +0200
committerJohan Klokkhammer Helsing <johan.helsing@qt.io>2019-05-29 12:36:33 +0200
commite008c69e231169425e2ae602deabc0eb749376ab (patch)
tree820285e73b266e7bf3e01e03b5232cfa8759dbf5
parentc1b65146f6b9ad98edea424742f7594712758377 (diff)
Fix compile error with -no-opengl
[ChangeLog][Compositor] Fixed a build error when configured with -no-opengl. This is the same fix as in dev's 8663de3f, but leaves the QML APIs disabled. Fixes: QTBUG-76104 Change-Id: I9807144e0c0cf33d421c7c6adcb2664e1e67368c Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
-rw-r--r--src/compositor/compositor_api/qwaylandcompositor.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/compositor/compositor_api/qwaylandcompositor.cpp b/src/compositor/compositor_api/qwaylandcompositor.cpp
index a0d69c52..52ffb916 100644
--- a/src/compositor/compositor_api/qwaylandcompositor.cpp
+++ b/src/compositor/compositor_api/qwaylandcompositor.cpp
@@ -243,8 +243,10 @@ QWaylandCompositorPrivate::~QWaylandCompositorPrivate()
delete data_device_manager;
#endif
+#if QT_CONFIG(opengl)
// Some client buffer integrations need to clean up before the destroying the wl_display
client_buffer_integration.reset();
+#endif
wl_display_destroy(display);
}