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, 85 insertions, 0 deletions

diff --git a/src/client/qwaylandqtkey.cpp b/src/client/qwaylandqtkey.cpp
new file mode 100644
index 000000000..263390a1f
--- /dev/null
+++ b/src/client/qwaylandqtkey.cpp
@@ -0,0 +1,85 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the plugins of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qwaylandqtkey_p.h"
+#include "qwaylandinputdevice_p.h"
+
+QT_BEGIN_NAMESPACE
+
+QWaylandQtKeyExtension::QWaylandQtKeyExtension(QWaylandDisplay *display, uint32_t id)
+    : QtWayland::qt_key_extension(display->wl_registry(), id)
+    , m_display(display)
+{
+}
+
+void QWaylandQtKeyExtension::key_extension_qtkey(struct wl_surface *surface,
+                                                 uint32_t time,
+                                                 uint32_t type,
+                                                 uint32_t key,
+                                                 uint32_t modifiers,
+                                                 uint32_t nativeScanCode,
+                                                 uint32_t nativeVirtualKey,
+                                                 uint32_t nativeModifiers,
+                                                 const QString &text,
+                                                 uint32_t autorep,
+                                                 uint32_t count)
+{
+    QList<QWaylandInputDevice *> inputDevices = m_display->inputDevices();
+    if (!surface && inputDevices.isEmpty()) {
+        qWarning("qt_key_extension: handle_qtkey: No input device");
+        return;
+    }
+
+    QWaylandInputDevice *dev = inputDevices.first();
+    QWaylandWindow *win = surface ? QWaylandWindow::fromWlSurface(surface) : dev->keyboardFocus();
+
+    if (!win || !win->window()) {
+        qWarning("qt_key_extension: handle_qtkey: No keyboard focus");
+        return;
+    }
+
+    QWindow *window = win->window();
+    QWindowSystemInterface::handleExtendedKeyEvent(window, time, QEvent::Type(type), key, Qt::KeyboardModifiers(modifiers),
+                                                   nativeScanCode, nativeVirtualKey, nativeModifiers, text,
+                                                   autorep, count);
+}
+
+QT_END_NAMESPACE