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 /qtwayland.pro | |
| 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 'qtwayland.pro')
| -rw-r--r-- | qtwayland.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qtwayland.pro b/qtwayland.pro index 8d5331eb7..a995ab3c8 100644 --- a/qtwayland.pro +++ b/qtwayland.pro @@ -12,7 +12,7 @@ qtCompileTest(xcomposite) load(qt_parts) !config_wayland { - warning("QtWayland requires Wayland 1.0.3 or higher") + warning("QtWayland requires Wayland 1.1.0 or higher") SUBDIRS = } |