Add Keyboard modifiers to MotionEventQt.

Also fix the mapping of Ctrl and Meta keys on Mac OSX.
On this platform Qt automatically maps Meta to Control
and vice versa. Chromium however does not expect such
behavior.

Change-Id: Ia9913322ae8ae6ffd99feb6edfc91b9ea752c5cb
Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>

1 files changed, 119 insertions, 0 deletions

diff --git a/tests/auto/quick/qmltests/data/tst_keyboardModifierMapping.qml b/tests/auto/quick/qmltests/data/tst_keyboardModifierMapping.qml
new file mode 100644
index 000000000..ddf025281
--- /dev/null
+++ b/tests/auto/quick/qmltests/data/tst_keyboardModifierMapping.qml
@@ -0,0 +1,119 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the Qt Quick Controls module 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$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import QtTest 1.0
+import QtWebEngine 1.0
+
+TestWebEngineView {
+    id: webEngineView
+    width: 400
+    height: 300
+
+    SignalSpy {
+        id: spy
+        target: webEngineView
+        signalName: "titleChanged"
+    }
+
+    TestCase {
+        name: "WebEngineViewKeyboardModifierMapping"
+
+        when: false
+        Timer {
+            running: parent.windowShown
+            repeat: false
+            interval: 1
+            onTriggered: parent.when = true
+        }
+
+        function test_keyboardModifierMapping() {
+            webEngineView.url = Qt.resolvedUrl("keyboardModifierMapping.html")
+            waitForLoadSucceeded();
+            var callbackCalled = false;
+
+            // Alt
+            keyPress(Qt.Key_Alt);
+            runJavaScript("getPressedModifiers()", function(result) {
+                    compare(result, "alt:pressed ctrl:no meta:no");
+                    callbackCalled = true;
+                });
+            wait(100);
+            verify(callbackCalled);
+            keyRelease(Qt.Key_Alt)
+            callbackCalled = false;
+
+            // Ctrl
+            // On mac Qt automatically translates Meta to Ctrl and vice versa.
+            // However, if sending the events manually no mapping is being done,
+            // so we have to do this here manually.
+            // For testing we assume that the flag Qt::AA_MacDontSwapCtrlAndMeta is NOT set.
+            keyPress(Qt.platform.os == "osx" ? Qt.Key_Meta : Qt.Key_Control);
+            runJavaScript("getPressedModifiers()", function(result) {
+                    compare(result, "alt:released ctrl:pressed meta:no");
+                    callbackCalled = true;
+                });
+            wait(100);
+            verify(callbackCalled);
+            keyRelease(Qt.platform.os == "osx" ? Qt.Key_Meta : Qt.Key_Control);
+            callbackCalled = false;
+
+            // Meta (Command on Mac)
+            keyPress(Qt.platform.os == "osx" ? Qt.Key_Control : Qt.Key_Meta);
+            runJavaScript("getPressedModifiers()", function(result) {
+                    compare(result, "alt:released ctrl:released meta:pressed");
+                    callbackCalled = true;
+                });
+            wait(100);
+            verify(callbackCalled);
+            keyRelease(Qt.platform.os == "osx" ? Qt.Key_Control : Qt.Key_Meta);
+            callbackCalled = false;
+
+            runJavaScript("getPressedModifiers()", function(result) {
+                    compare(result, "alt:released ctrl:released meta:released");
+                    callbackCalled = true;
+                });
+            wait(100);
+            verify(callbackCalled);
+            callbackCalled = false;
+        }
+    }
+}