Merge remote-tracking branch stable into dev

Conflicts:
	.qmake.conf
	src/compositor/hardware_integration/qwaylandclientbufferintegrationplugin.h
	src/plugins/hardwareintegration/compositor/brcm-egl/main.cpp
	src/plugins/hardwareintegration/compositor/wayland-egl/main.cpp
	src/plugins/hardwareintegration/compositor/xcomposite-egl/main.cpp
	src/plugins/hardwareintegration/compositor/xcomposite-glx/main.cpp
	src/plugins/platforms/qwayland-brcm-egl/main.cpp
	src/plugins/platforms/qwayland-egl/main.cpp
	src/plugins/platforms/qwayland-generic/main.cpp
	src/plugins/platforms/qwayland-xcomposite-egl/main.cpp
	src/plugins/platforms/qwayland-xcomposite-glx/main.cpp

Change-Id: I957c9bee893a9e19fc8c93f0e51292007fb3a4a8

5 files changed, 71 insertions, 4 deletions

diff --git a/config.tests/drm_egl_server/drm_egl_server.pro b/config.tests/drm_egl_server/drm_egl_server.pro
new file mode 100644
index 00000000..328354eb
--- /dev/null
+++ b/config.tests/drm_egl_server/drm_egl_server.pro
@@ -0,0 +1,14 @@
+TARGET = drm_egl_server
+QT = core
+
+!contains(QT_CONFIG, opengl): error("drm_egl_server support requires Qt configured with OpenGL")
+
+!contains(QT_CONFIG, no-pkg-config) {
+    CONFIG += link_pkgconfig
+    PKGCONFIG += egl
+} else {
+    LIBS += -legl
+}
+
+# Input
+SOURCES += main.cpp
diff --git a/config.tests/drm_egl_server/main.cpp b/config.tests/drm_egl_server/main.cpp
new file mode 100644
index 00000000..7ac62bd6
--- /dev/null
+++ b/config.tests/drm_egl_server/main.cpp
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** 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 <EGL/egl.h>
+#include <EGL/eglext.h>
+
+int main()
+{
+#ifdef EGL_MESA_drm_image
+    return 0;
+#else
+#error Requires EGL_MESA_drm_image to be defined
+    return 1;
+#endif
+}
diff --git a/config.tests/egl/egl.pro b/config.tests/egl/egl.pro
index e96672e5..402477db 100644
--- a/config.tests/egl/egl.pro
+++ b/config.tests/egl/egl.pro
@@ -1,7 +1,8 @@
 TARGET = egl
 QT = core
 
-!contains(QT_CONFIG, opengles2):error("wayland_egl support currently requires Qt configured with OpenGL ES2")
+!contains(QT_CONFIG, opengl): error("egl support requires Qt configured with OpenGL")
+!contains(QT_CONFIG, egl): error("egl support requires Qt configured with EGL")
 
 !contains(QT_CONFIG, no-pkg-config) {
     CONFIG += link_pkgconfig
diff --git a/config.tests/wayland_egl/wayland_egl.pro b/config.tests/wayland_egl/wayland_egl.pro
index 0db9b04f..42d6b131 100644
--- a/config.tests/wayland_egl/wayland_egl.pro
+++ b/config.tests/wayland_egl/wayland_egl.pro
@@ -1,7 +1,8 @@
 TARGET = wayland_egl
 QT = core
 
-!contains(QT_CONFIG, opengles2):error("wayland_egl support currently requires Qt configured with OpenGL ES2")
+!contains(QT_CONFIG, opengl): error("wayland_egl support requires Qt configured with OpenGL")
+!contains(QT_CONFIG, egl): error("wayland_egl support requires Qt configured with EGL")
 
 !contains(QT_CONFIG, no-pkg-config) {
     CONFIG += link_pkgconfig
diff --git a/config.tests/xkbcommon/main.cpp b/config.tests/xkbcommon/main.cpp
index 926a3a1a..801394c8 100644
--- a/config.tests/xkbcommon/main.cpp
+++ b/config.tests/xkbcommon/main.cpp
@@ -39,8 +39,7 @@
 ****************************************************************************/
 
 #include <xkbcommon/xkbcommon.h>
-#include <X11/keysym.h>
-
+#include <xkbcommon/xkbcommon-keysyms.h>
 #include <string.h>
 
 int main()