diff options
| -rw-r--r-- | README | 9 | ||||
| -rw-r--r-- | examples/examples.pro | 17 | ||||
| -rw-r--r-- | src/src.pro | 6 | ||||
| -rw-r--r-- | tests/auto/auto.pro | 8 |
4 files changed, 31 insertions, 9 deletions
@@ -8,9 +8,16 @@ Wayland platform plugin: QtCompositor API: Enables the creation of Wayland compositors using Qt and QtQuick. +By default only the Wayland platform plugin is built. If you want to build the +experimental QtCompositor API then you need to set the qmake CONFIG variable to +include "wayland-compositor" when building the QtWayland module: + +qmake CONFIG+=wayland-compositor +make + To build the QtWayland module you need the external dependencies: xkbcommon 0.2.0 - http://xkbcommon.org/ -libwayland 1.0.1 - http://wayland.freedesktop.org/ +wayland 1.0.3 - http://wayland.freedesktop.org/ We hang out at #qt-labs and #qt-lighthouse on freenode if you have any questions diff --git a/examples/examples.pro b/examples/examples.pro index 519622b59..35459b0a4 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -1,10 +1,15 @@ TEMPLATE=subdirs -SUBDIRS += qwindow-compositor -qtHaveModule(widgets) { - SUBDIRS += qwidget-compositor -} +#Only build compositor examples if we are building +#the QtCompositor API +contains(CONFIG, wayland-compositor) { + SUBDIRS += qwindow-compositor + + qtHaveModule(widgets) { + SUBDIRS += qwidget-compositor + } -qtHaveModule(quick) { - SUBDIRS += qml-compositor + qtHaveModule(quick) { + SUBDIRS += qml-compositor + } } diff --git a/src/src.pro b/src/src.pro index f2e6d6136..c4d03afb0 100644 --- a/src/src.pro +++ b/src/src.pro @@ -1,4 +1,8 @@ TEMPLATE=subdirs -SUBDIRS += compositor plugins +SUBDIRS = plugins +#Don't build QtCompositor API unless explicitly enabled +contains(CONFIG, wayland-compositor) { + SUBDIRS += compositor +} diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 2f3167d68..5e6056181 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -1,2 +1,8 @@ TEMPLATE=subdirs -SUBDIRS=client compositor +SUBDIRS=client + +#Only build compositor test when we are +#building QtCompositor +contains(CONFIG, wayland-compositor) { + SUBDIRS += compositor +} |