diff options
| author | Johan Klokkhammer Helsing <johan.helsing@theqtcompany.com> | 2016-03-17 15:51:29 +0100 |
|---|---|---|
| committer | Pier Luigi Fiorini <pierluigi.fiorini@gmail.com> | 2016-03-17 19:45:54 +0000 |
| commit | c7aa6bae0cf827d5a6bbfebea947d557b56a2bfb (patch) | |
| tree | d7bd62920d50d508e3922e9cd3cafdee64eea890 | |
| parent | bbc24ce7708b8b31313144d43e892f5838fcfafb (diff) | |
Upgrade required Wayland version to 1.6.0
This makes sure QtWayland is only built if a Wayland version >= 1.6.0 is
found. Upgraded from 1.4.0.
Change-Id: Ibbd965f9e25ae9fd15d9367431574c5c1ff8b7ce
Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | config.tests/wayland/main.cpp | 10 | ||||
| -rw-r--r-- | qtwayland.pro | 2 |
3 files changed, 7 insertions, 7 deletions
@@ -20,7 +20,7 @@ doubt, run git clean -f -d -x. To build the QtWayland module you need the external dependencies: xkbcommon 0.2.0 - http://xkbcommon.org/ -wayland 1.2.0 - http://wayland.freedesktop.org/ +wayland 1.6.0 - http://wayland.freedesktop.org/ QtCompositor supports loading client buffer integrations that don't use the wayland-egl interfaces. These client buffer integrations are picked up by diff --git a/config.tests/wayland/main.cpp b/config.tests/wayland/main.cpp index 612f7a164..1af00ee38 100644 --- a/config.tests/wayland/main.cpp +++ b/config.tests/wayland/main.cpp @@ -43,15 +43,15 @@ int main() { #if WAYLAND_VERSION_MAJOR < 1 -# error Wayland 1.4.0 or higher required +# error Wayland 1.6.0 or higher required #endif #if WAYLAND_VERSION_MAJOR == 1 -# if WAYLAND_VERSION_MINOR < 4 -# error Wayland 1.4.0 or higher required +# if WAYLAND_VERSION_MINOR < 6 +# error Wayland 1.6.0 or higher required # endif -# if WAYLAND_VERSION_MINOR == 4 +# if WAYLAND_VERSION_MINOR == 6 # if WAYLAND_VERSION_MICRO < 0 -# error Wayland 1.4.0 or higher required +# error Wayland 1.6.0 or higher required # endif # endif #endif diff --git a/qtwayland.pro b/qtwayland.pro index b5088072f..f71b842d8 100644 --- a/qtwayland.pro +++ b/qtwayland.pro @@ -15,7 +15,7 @@ qtCompileTest(libhybris_egl_server) load(qt_parts) !config_wayland { - warning("QtWayland requires Wayland 1.4.0 or higher, QtWayland will not be built") + warning("QtWayland requires Wayland 1.6.0 or higher, QtWayland will not be built") SUBDIRS = } |