summaryrefslogtreecommitdiffstats
path: root/README
diff options
context:
space:
mode:
authorAndy Nichols <andy.nichols@digia.com>2013-01-31 12:48:54 +0100
committerAndy Nichols <andy.nichols@digia.com>2013-02-05 12:06:11 +0100
commit634c4f6877d63cc30914049989b5cbfd18cd15c3 (patch)
treea928ac8ef4750b3a0e597c001a5bb7e081203cc0 /README
parentb0582106afe1ebb8a77c6d442966f76bde40f092 (diff)
Don't build QtCompositor unless explicitly enabled
The QtCompositor API is to be considered experimental in Qt 5.1 and thus it should be disabled from being built by default. If the qmake variable CONFIG contains "wayland-compositor" then the QtCompositor API will be built. Change-Id: If10f5a688749f31338a80be45bbec22a0f2d12da Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com> Reviewed-by: Jørgen Lind <jorgen.lind@gmail.com> Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Diffstat (limited to 'README')
-rw-r--r--README9
1 files changed, 8 insertions, 1 deletions
diff --git a/README b/README
index e32485040..291d0a266 100644
--- a/README
+++ b/README
@@ -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