diff options
| author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2016-06-24 12:45:48 +0200 |
|---|---|---|
| committer | Johan Helsing <johan.helsing@qt.io> | 2016-07-20 08:24:21 +0000 |
| commit | b6dff11dc9781b677c02c8308a44e85f2d919fa0 (patch) | |
| tree | c7e7c0f3d3a8eed8222ff763ae295c074acc5e53 /examples | |
| parent | ef3e687fe6b983fb0a5bf648f2d66f2eadd85b58 (diff) | |
Compile with -no-opengl
QtWayland has not compiled without OpenGL for a while.
This patch fixes the compilation issues and removes the old config variable,
"QT_WAYLAND_GL_CONFIG" and instead checks for the presence of "opengl" in
"QT_CONFIG". A new define is also introduced, QT_WAYLAND_COMPOSITOR_QUICK,
because it may eventually be possible to use create a QtQuick compositor
without OpenGL.
Task-number: QTBUG-54322
Change-Id: Ica7b3b320212d4ae1f8b1053725b73c83739c73c
Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/wayland/wayland.pro | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/examples/wayland/wayland.pro b/examples/wayland/wayland.pro index 503190c8a..d4b631403 100644 --- a/examples/wayland/wayland.pro +++ b/examples/wayland/wayland.pro @@ -1,13 +1,14 @@ TEMPLATE=subdirs -SUBDIRS += qwindow-compositor -SUBDIRS += minimal-cpp +contains(QT_CONFIG, opengl) { + SUBDIRS += qwindow-compositor + SUBDIRS += minimal-cpp +} -qtHaveModule(quick) { +contains(QT_CONFIG, opengl):qtHaveModule(quick) { SUBDIRS += minimal-qml SUBDIRS += pure-qml SUBDIRS += multi-output SUBDIRS += custom-extension + SUBDIRS += server-buffer } - -SUBDIRS += server-buffer |