Merge remote-tracking branch 'origin/dev' into stable

Conflicts:
	src/compositor/wayland_wrapper/qwlsurface.cpp

Change-Id: I3b6a4af41f272d3dc7fc920ba2542f2dd7978175

3 files changed, 70 insertions, 8 deletions

diff --git a/config.tests/wayland/main.cpp b/config.tests/wayland/main.cpp
index de4e9edbb..fb9915305 100644
--- a/config.tests/wayland/main.cpp
+++ b/config.tests/wayland/main.cpp
@@ -43,15 +43,17 @@
 int main()
 {
 #if WAYLAND_VERSION_MAJOR < 1
-# error Wayland 1.1.0 or higher required
+# error Wayland 1.3.0 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
+#if WAYLAND_VERSION_MAJOR == 1
+# if WAYLAND_VERSION_MINOR < 3
+#  error Wayland 1.3.0 or higher required
+# endif
+# if WAYLAND_VERSION_MINOR == 3
+#  if WAYLAND_VERSION_MICRO < 0
+#   error Wayland 1.3.0 or higher required
+#  endif
 # endif
+#endif
     return 0;
 }
diff --git a/config.tests/wayland_cursor/main.cpp b/config.tests/wayland_cursor/main.cpp
new file mode 100644
index 000000000..299e2e3b2
--- /dev/null
+++ b/config.tests/wayland_cursor/main.cpp
@@ -0,0 +1,48 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the Qt Compositor.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
+**     of its contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <wayland-cursor.h>
+
+int main()
+{
+    struct wl_cursor_image *image = 0;
+
+    return 0;
+}
diff --git a/config.tests/wayland_cursor/wayland_cursor.pro b/config.tests/wayland_cursor/wayland_cursor.pro
new file mode 100644
index 000000000..aa38d32fb
--- /dev/null
+++ b/config.tests/wayland_cursor/wayland_cursor.pro
@@ -0,0 +1,12 @@
+TARGET = wayland_cursor
+QT = core
+
+!contains(QT_CONFIG, no-pkg-config) {
+    CONFIG += link_pkgconfig
+    PKGCONFIG += wayland-cursor
+} else {
+    LIBS += -lwayland-cursor
+}
+
+# Input
+SOURCES += main.cpp