summaryrefslogtreecommitdiffstats
path: root/qtwayland.pro
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar.sletta@jollamobile.com>2014-03-25 10:32:45 +0100
committerGunnar Sletta <gunnar.sletta@jollamobile.com>2014-03-25 10:32:45 +0100
commit8b1109a0d5214f63d9cff2653e3bbf8648ad4ad4 (patch)
treeb3f07ec39b36040d4bbd403bbb68aaef0f3a4e0a /qtwayland.pro
parent63b0fef9eb1fe6e65333b03418b9c9a2fb33dfbc (diff)
parenta07bf91a15fe176f5b25e96aeea5b1b40fff947b (diff)
Merge branch 'stable' into dev
Conflicts: src/compositor/compositor_api/qwaylandsurfaceitem.cpp src/compositor/wayland_wrapper/qwlcompositor.cpp Change-Id: Ibbed140c7694ea7fd1882ebb0139b376546b8b50
Diffstat (limited to 'qtwayland.pro')
-rw-r--r--qtwayland.pro2
1 files changed, 1 insertions, 1 deletions
diff --git a/qtwayland.pro b/qtwayland.pro
index d6971baa..497483bd 100644
--- a/qtwayland.pro
+++ b/qtwayland.pro
@@ -13,7 +13,7 @@ qtCompileTest(drm_egl_server)
load(qt_parts)
!config_wayland {
- warning("QtWayland requires Wayland 1.1.0 or higher")
+ warning("QtWayland requires Wayland 1.2.0 or higher")
SUBDIRS =
}