diff options
author | Andy Nichols <andy.nichols@digia.com> | 2013-03-02 18:42:54 +0100 |
---|---|---|
committer | Andy Nichols <andy.nichols@digia.com> | 2013-03-02 22:06:26 +0100 |
commit | 317c735b2e5694a87c9a87b177e6915c070e2a56 (patch) | |
tree | 558d3754b7a7dee1f4c6db9515d80c0c38b7a0c0 | |
parent | 4d124fea48a0d094443ed0e031c8e28ec04611a3 (diff) |
Set required Wayland version to 1.0.3 or higher
We need this version to support the changes made for threaded Wayland
event processing.
Change-Id: I64babb4e21c3581feb5db843539f85539011c1e6
Reviewed-by: Jørgen Lind <jorgen.lind@gmail.com>
-rw-r--r-- | config.tests/wayland/main.cpp | 9 | ||||
-rw-r--r-- | qtwayland.pro | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/config.tests/wayland/main.cpp b/config.tests/wayland/main.cpp index c03d80349..e247df3f8 100644 --- a/config.tests/wayland/main.cpp +++ b/config.tests/wayland/main.cpp @@ -43,7 +43,12 @@ int main() { #if WAYLAND_VERSION_MAJOR < 1 -# error Wayland 1.0.0 or higher required +# error Wayland 1.0.3 or higher required +#endif +#if WAYLAND_VERSION_MINOR == 0 +# if WAYLAND_VERSION_MICRO < 3 +# error Wayland 1.0.3 or higher required +# endif #endif return 0; -}
\ No newline at end of file +} diff --git a/qtwayland.pro b/qtwayland.pro index ee0e5ac1b..3d5a6b07e 100644 --- a/qtwayland.pro +++ b/qtwayland.pro @@ -11,7 +11,7 @@ qtCompileTest(xcomposite) load(qt_parts) !config_wayland { - error(QtWayland requires Wayland 1.0.0 or higher) + error(QtWayland requires Wayland 1.0.3 or higher) } !config_xkbcommon { |