summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorJohan Klokkhammer Helsing <johan.helsing@qt.io>2017-01-12 14:04:04 +0100
committerJohan Helsing <johan.helsing@qt.io>2019-04-04 12:10:05 +0000
commit8663de3fa789d8b8e10c5580b37f6eb3beac9ed6 (patch)
tree326bb613e96f8944b1bb93d9ff90149725b7c26c /examples
parentc87451570f93fd7bf8653c27d6120f6436b9aaae (diff)
Compositor: Don't require OpenGL to build the QML APIs
[ChangeLog][Compositor API] The compositor API now works without OpenGL support. This makes the compositor API work with shared memory clients only. If OpenGL clients connect they will currently punch holes in the compositor window, but fixing that is out of scope for this patch. Fixes: QTBUG-74896 Change-Id: I6c1ba82f28ba9edecf380e471124e15d16f9518e Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Diffstat (limited to 'examples')
-rw-r--r--examples/wayland/wayland.pro19
1 files changed, 12 insertions, 7 deletions
diff --git a/examples/wayland/wayland.pro b/examples/wayland/wayland.pro
index f8a360c1a..eeb962eb2 100644
--- a/examples/wayland/wayland.pro
+++ b/examples/wayland/wayland.pro
@@ -1,10 +1,11 @@
requires(qtHaveModule(waylandcompositor))
-requires(qtConfig(opengl))
TEMPLATE=subdirs
-SUBDIRS += \
- qwindow-compositor \
- minimal-cpp
+qtHaveModule(opengl) {
+ SUBDIRS += \
+ qwindow-compositor \
+ minimal-cpp
+}
qtHaveModule(quick) {
SUBDIRS += minimal-qml
@@ -17,9 +18,13 @@ qtHaveModule(quick) {
SUBDIRS += server-side-decoration
qtHaveModule(waylandclient) {
SUBDIRS += \
- custom-extension \
- server-buffer \
- texture-sharing
+ custom-extension
+
+ qtHaveModule(opengl) {
+ SUBDIRS += \
+ server-buffer \
+ texture-sharing
+ }
}
SUBDIRS += hwlayer-compositor
}