diff options
| author | Andy Nichols <andy.nichols@digia.com> | 2013-09-09 13:58:40 +0200 |
|---|---|---|
| committer | Andy Nichols <andy.nichols@digia.com> | 2013-09-09 13:58:40 +0200 |
| commit | 82b7f6faed8961acc07ff6ee56236d001000f149 (patch) | |
| tree | 75d9acd9aba89b927021196d7be8922ad83bece1 /config.tests | |
| parent | aa0584194b5fe3dd01830dbaed231dabfa6d455d (diff) | |
| parent | 330c429991ef1c32ffdd51cdc8627ef1b71604b3 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
qtwayland.pro
src/plugins/platforms/wayland_common/qwaylandshellsurface.cpp
src/plugins/platforms/wayland_common/qwaylandshellsurface.h
src/plugins/platforms/wayland_common/qwaylandwindow.cpp
src/plugins/platforms/wayland_common/qwaylandwindow.h
Change-Id: Ifa9bc553d826b893b054bbaef5ea3fc3013de3df
Diffstat (limited to 'config.tests')
| -rw-r--r-- | config.tests/wayland/main.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/config.tests/wayland/main.cpp b/config.tests/wayland/main.cpp index e247df3f8..de4e9edbb 100644 --- a/config.tests/wayland/main.cpp +++ b/config.tests/wayland/main.cpp @@ -43,12 +43,15 @@ int main() { #if WAYLAND_VERSION_MAJOR < 1 -# error Wayland 1.0.3 or higher required +# error Wayland 1.1.0 or higher required #endif -#if WAYLAND_VERSION_MINOR == 0 -# if WAYLAND_VERSION_MICRO < 3 -# error Wayland 1.0.3 or higher required -# endif +#if WAYLAND_VERSION_MINOR < 1 +# error Wayland 1.1.0 or higher required #endif +#if WAYLAND_VERSION_MINOR < 2 +//# if WAYLAND_VERSION_MICRO < 0 +//# error Wayland 1.1.0 or higher required +//# endif +# endif return 0; } |