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

1 files changed, 11 insertions, 2 deletions

diff --git a/src/compositor/wayland_wrapper/qwlkeyboard_p.h b/src/compositor/wayland_wrapper/qwlkeyboard_p.h
index 80b211060..4d783f77e 100644
--- a/src/compositor/wayland_wrapper/qwlkeyboard_p.h
+++ b/src/compositor/wayland_wrapper/qwlkeyboard_p.h
@@ -42,7 +42,10 @@
 #ifndef QTWAYLAND_QWLKEYBOARD_P_H
 #define QTWAYLAND_QWLKEYBOARD_P_H
 
-#include <qwayland-server-wayland.h>
+#include <QtCompositor/qwaylandexport.h>
+
+#include <QObject>
+#include <QtCompositor/private/qwayland-server-wayland.h>
 
 #include <QtCore/QByteArray>
 
@@ -58,8 +61,10 @@ class Compositor;
 class InputDevice;
 class Surface;
 
-class Keyboard : public QtWaylandServer::wl_keyboard
+class Q_COMPOSITOR_EXPORT Keyboard : public QObject, public QtWaylandServer::wl_keyboard
 {
+    Q_OBJECT
+
 public:
     Keyboard(Compositor *compositor, InputDevice *seat);
     ~Keyboard();
@@ -71,6 +76,10 @@ public:
     void sendKeyReleaseEvent(uint code);
 
     Surface *focus() const;
+    Resource *focusResource() const;
+
+Q_SIGNALS:
+    void focusChanged(Surface *surface);
 
 protected:
     void keyboard_bind_resource(Resource *resource);