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

Change-Id: I50759e6601b02f87e07083a64fca23e0f4e23ca7

5 files changed, 160 insertions, 5 deletions

diff --git a/tests/auto/qml/qjsengine/tst_qjsengine.cpp b/tests/auto/qml/qjsengine/tst_qjsengine.cpp
index cc0a1e9a93..a8fe8f6509 100644
--- a/tests/auto/qml/qjsengine/tst_qjsengine.cpp
+++ b/tests/auto/qml/qjsengine/tst_qjsengine.cpp
@@ -2999,7 +2999,7 @@ void tst_QJSEngine::arraySort()
 void tst_QJSEngine::lookupOnDisappearingProperty()
 {
     QJSEngine eng;
-    QJSValue func = eng.evaluate("(function(){\"use strict\"; return eval(\"function(obj) { return obj.someProperty; }\")})()");
+    QJSValue func = eng.evaluate("(function(){\"use strict\"; return eval(\"(function(obj) { return obj.someProperty; })\")})()");
     QVERIFY(func.isCallable());
 
     QJSValue o = eng.newObject();
@@ -3344,7 +3344,7 @@ void tst_QJSEngine::prototypeChainGc()
 
     QJSValue getProto = engine.evaluate("Object.getPrototypeOf");
 
-    QJSValue factory = engine.evaluate("function() { return Object.create(Object.create({})); }");
+    QJSValue factory = engine.evaluate("(function() { return Object.create(Object.create({})); })");
     QVERIFY(factory.isCallable());
     QJSValue obj = factory.call();
     engine.collectGarbage();
diff --git a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
index 18b1718ddf..8913528d79 100644
--- a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
+++ b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
@@ -2131,7 +2131,7 @@ void tst_qqmllanguage::scriptStringJs()
     QVERIFY(!object->scriptProperty().booleanLiteral(&ok) && !ok);
 
     QJSValue inst = engine.newQObject(object.data());
-    QJSValue func = engine.evaluate("function(value) { this.scriptProperty = value }");
+    QJSValue func = engine.evaluate("(function(value) { this.scriptProperty = value })");
 
     func.callWithInstance(inst, QJSValueList() << "test a \"string ");
     QCOMPARE(QQmlScriptStringPrivate::get(object->scriptProperty())->script, QString("\"test a \\\"string \""));
@@ -2263,7 +2263,7 @@ void tst_qqmllanguage::scriptStringComparison()
     //QJSValue inst1 = engine.newQObject(object1);
     QJSValue inst2 = engine.newQObject(object2.data());
     QJSValue inst3 = engine.newQObject(object3.data());
-    QJSValue func = engine.evaluate("function(value) { this.scriptProperty = value }");
+    QJSValue func = engine.evaluate("(function(value) { this.scriptProperty = value })");
 
     const QString s = "hello\\n\\\"world\\\"";
     const qreal n = 12.345;
diff --git a/tests/auto/quickwidgets/qquickwidget/data/activeFocusOnTab.qml b/tests/auto/quickwidgets/qquickwidget/data/activeFocusOnTab.qml
new file mode 100644
index 0000000000..9ad1cafed9
--- /dev/null
+++ b/tests/auto/quickwidgets/qquickwidget/data/activeFocusOnTab.qml
@@ -0,0 +1,60 @@
+/****************************************************************************
+**
+** Copyright (C) 2018 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.1
+
+Item {
+    Rectangle {
+        objectName: "topRect"
+        x: 0
+        width: 50
+        height: 50
+        activeFocusOnTab: true
+        focus: true
+        color: activeFocus ? "green" : "red"
+    }
+    Rectangle {
+        objectName: "middleRect"
+        x: 50
+        width: 50
+        height: 50
+        focus: true
+        activeFocusOnTab: true
+        color: activeFocus ? "green" : "red"
+    }
+    Rectangle {
+        objectName: "bottomRect"
+        x: 100
+        width: 50
+        height: 50
+        focus: true
+        activeFocusOnTab: true
+        color: activeFocus ? "green" : "red"
+    }
+}
+
diff --git a/tests/auto/quickwidgets/qquickwidget/data/noActiveFocusOnTab.qml b/tests/auto/quickwidgets/qquickwidget/data/noActiveFocusOnTab.qml
new file mode 100644
index 0000000000..6d86ce45bb
--- /dev/null
+++ b/tests/auto/quickwidgets/qquickwidget/data/noActiveFocusOnTab.qml
@@ -0,0 +1,57 @@
+/****************************************************************************
+**
+** Copyright (C) 2018 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.1
+
+Item {
+    Rectangle {
+        objectName: "topRect2"
+        x: 0
+        width: 50
+        height: 50
+        focus: true
+        color: activeFocus ? "green" : "red"
+    }
+    Rectangle {
+        objectName: "middleRect2"
+        x: 50
+        width: 50
+        height: 50
+        focus: true
+        color: activeFocus ? "green" : "red"
+    }
+    Rectangle {
+        objectName: "bottomRect3"
+        x: 100
+        width: 50
+        height: 50
+        focus: true
+        color: activeFocus ? "green" : "red"
+    }
+}
+
diff --git a/tests/auto/quickwidgets/qquickwidget/tst_qquickwidget.cpp b/tests/auto/quickwidgets/qquickwidget/tst_qquickwidget.cpp
index a97e3c0538..af358925fe 100644
--- a/tests/auto/quickwidgets/qquickwidget/tst_qquickwidget.cpp
+++ b/tests/auto/quickwidgets/qquickwidget/tst_qquickwidget.cpp
@@ -40,7 +40,7 @@
 #include <QtQml/qqmlengine.h>
 
 #include <QtCore/QLoggingCategory>
-
+#include <QtGui/qstylehints.h>
 #include <QtWidgets/QBoxLayout>
 #include <QtWidgets/QLabel>
 
@@ -140,6 +140,7 @@ private slots:
     void mouseEventWindowPos();
     void synthMouseFromTouch_data();
     void synthMouseFromTouch();
+    void tabKey();
 
 private:
     QTouchDevice *device = QTest::createTouchDevice();
@@ -620,6 +621,43 @@ void tst_qquickwidget::synthMouseFromTouch()
         QCOMPARE(ev.source(), Qt::MouseEventSynthesizedByQt);
 }
 
+void tst_qquickwidget::tabKey()
+{
+    if (QGuiApplication::styleHints()->tabFocusBehavior() != Qt::TabFocusAllControls)
+        QSKIP("This function doesn't support NOT iterating all.");
+    QWidget window1;
+    QQuickWidget *qqw = new QQuickWidget(&window1);
+    qqw->setSource(testFileUrl("activeFocusOnTab.qml"));
+    QQuickWidget *qqw2 = new QQuickWidget(&window1);
+    qqw2->setSource(testFileUrl("noActiveFocusOnTab.qml"));
+    qqw2->move(100, 0);
+    window1.show();
+    qqw->setFocus();
+    QVERIFY(QTest::qWaitForWindowExposed(&window1, 5000));
+    QVERIFY(qqw->hasFocus());
+    QQuickItem *item = qobject_cast<QQuickItem *>(qqw->rootObject());
+    QQuickItem *topItem = item->findChild<QQuickItem *>("topRect");
+    QQuickItem *middleItem = item->findChild<QQuickItem *>("middleRect");
+    QQuickItem *bottomItem = item->findChild<QQuickItem *>("bottomRect");
+    topItem->forceActiveFocus();
+    QVERIFY(topItem->property("activeFocus").toBool());
+    QTest::keyClick(qqw, Qt::Key_Tab);
+    QTRY_VERIFY(middleItem->property("activeFocus").toBool());
+    QTest::keyClick(qqw, Qt::Key_Tab);
+    QTRY_VERIFY(bottomItem->property("activeFocus").toBool());
+    QTest::keyClick(qqw, Qt::Key_Backtab);
+    QTRY_VERIFY(middleItem->property("activeFocus").toBool());
+
+    qqw2->setFocus();
+    QQuickItem *item2 = qobject_cast<QQuickItem *>(qqw2->rootObject());
+    QQuickItem *topItem2 = item2->findChild<QQuickItem *>("topRect2");
+    QTRY_VERIFY(qqw2->hasFocus());
+    QVERIFY(topItem2->property("activeFocus").toBool());
+    QTest::keyClick(qqw2, Qt::Key_Tab);
+    QTRY_VERIFY(qqw->hasFocus());
+    QVERIFY(middleItem->property("activeFocus").toBool());
+}
+
 QTEST_MAIN(tst_qquickwidget)
 
 #include "tst_qquickwidget.moc"