Merge remote-tracking branch 'origin/5.6' into 5.7

Conflicts:
	src/quick/items/qquickitem.cpp
	tests/auto/quick/qquickgridview/tst_qquickgridview.cpp
	tests/auto/quick/qquicklistview/tst_qquicklistview.cpp

Change-Id: I3cf47faa2fe567d62fffd985aeecbefe5811cc42

13 files changed, 350 insertions, 91 deletions

diff --git a/tests/auto/qml/qjsengine/tst_qjsengine.cpp b/tests/auto/qml/qjsengine/tst_qjsengine.cpp
index fe3efcd948..253b050b15 100644
--- a/tests/auto/qml/qjsengine/tst_qjsengine.cpp
+++ b/tests/auto/qml/qjsengine/tst_qjsengine.cpp
@@ -185,6 +185,8 @@ private slots:
 
     void argumentEvaluationOrder();
 
+    void v4FunctionWithoutQML();
+
 signals:
     void testSignal();
 };
@@ -3794,6 +3796,30 @@ void tst_QJSEngine::argumentEvaluationOrder()
 
 }
 
+class TestObject : public QObject
+{
+    Q_OBJECT
+public:
+    TestObject() : called(false) {}
+
+    bool called;
+
+    Q_INVOKABLE void callMe(QQmlV4Function *) {
+        called = true;
+    }
+};
+
+void tst_QJSEngine::v4FunctionWithoutQML()
+{
+    TestObject obj;
+    QJSEngine engine;
+    QJSValue wrapper = engine.newQObject(&obj);
+    QQmlEngine::setObjectOwnership(&obj, QQmlEngine::CppOwnership);
+    QVERIFY(!obj.called);
+    wrapper.property("callMe").call();
+    QVERIFY(obj.called);
+}
+
 QTEST_MAIN(tst_QJSEngine)
 
 #include "tst_qjsengine.moc"
diff --git a/tests/auto/quick/qquickgridview/data/qtbug48870.qml b/tests/auto/quick/qquickgridview/data/qtbug48870.qml
new file mode 100644
index 0000000000..7c0783fbb5
--- /dev/null
+++ b/tests/auto/quick/qquickgridview/data/qtbug48870.qml
@@ -0,0 +1,30 @@
+import QtQuick 2.6
+
+Rectangle {
+    width: 500
+    height: 500
+    color: "blue"
+
+    GridView {
+        id: view
+        objectName: "view"
+        anchors.fill: parent
+        model: testModel
+        cellWidth: 150
+        cellHeight: 150
+        readonly property int columns: Math.floor(width / cellWidth)
+
+        delegate: Rectangle {
+            width: GridView.view.cellWidth
+            height: GridView.view.cellHeight
+            color: (row & 1) != (col & 1) ? "green" : "red"
+            readonly property int row: index / view.columns
+            readonly property int col: index % view.columns
+
+            Text {
+                anchors.centerIn: parent
+                text: "Item " + index
+            }
+        }
+    }
+}
diff --git a/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp b/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp
index b3474db7de..07c03a57d7 100644
--- a/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp
+++ b/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp
@@ -36,6 +36,7 @@
 #include <QtQml/qqmlincubator.h>
 #include <QtQml/qqmlcontext.h>
 #include <QtQuick/private/qquickitem_p.h>
+#include <QtQuick/private/qquickitemview_p_p.h>
 #include <QtQuick/private/qquickgridview_p.h>
 #include <QtQuick/private/qquicktext_p.h>
 #include <QtQml/private/qqmllistmodel_p.h>
@@ -205,6 +206,7 @@ private slots:
     void contentHeightWithDelayRemove();
 
     void QTBUG_45640();
+    void QTBUG_48870_fastModelUpdates();
 
     void keyNavigationEnabled();
 
@@ -6628,6 +6630,42 @@ void tst_QQuickGridView::keyNavigationEnabled()
     QCOMPARE(gridView->currentIndex(), 1);
 }
 
+void tst_QQuickGridView::QTBUG_48870_fastModelUpdates()
+{
+    StressTestModel model;
+
+    QScopedPointer<QQuickView> window(createView());
+    QQmlContext *ctxt = window->rootContext();
+    ctxt->setContextProperty("testModel", &model);
+
+    window->setSource(testFileUrl("qtbug48870.qml"));
+    window->show();
+    QVERIFY(QTest::qWaitForWindowExposed(window.data()));
+
+    QQuickGridView *view = findItem<QQuickGridView>(window->rootObject(), "view");
+    QTRY_VERIFY(view != 0);
+
+    QQuickItemViewPrivate *priv = QQuickItemViewPrivate::get(view);
+    bool nonUnique;
+    FxViewItem *item = Q_NULLPTR;
+    int expectedIdx;
+    QVERIFY(testVisibleItems(priv, &nonUnique, &item, &expectedIdx));
+
+    for (int i = 0; i < 10; i++) {
+        QTest::qWait(100);
+        QVERIFY2(testVisibleItems(priv, &nonUnique, &item, &expectedIdx),
+                 qPrintable(!item ? QString("Unexpected null item")
+                            : nonUnique ? QString("Non-unique item at %1 and %2").arg(item->index).arg(expectedIdx)
+                                        : QString("Found index %1, expected index is %3").arg(item->index).arg(expectedIdx)));
+        if (i % 3 != 0) {
+            if (i & 1)
+                flick(window.data(), QPoint(100, 200), QPoint(100, 0), 100);
+            else
+                flick(window.data(), QPoint(100, 200), QPoint(100, 400), 100);
+        }
+    }
+}
+
 QTEST_MAIN(tst_QQuickGridView)
 
 #include "tst_qquickgridview.moc"
diff --git a/tests/auto/quick/qquickitem2/data/qtbug_50516_2_1.qml b/tests/auto/quick/qquickitem2/data/qtbug_50516_2_1.qml
new file mode 100644
index 0000000000..d8b7833467
--- /dev/null
+++ b/tests/auto/quick/qquickitem2/data/qtbug_50516_2_1.qml
@@ -0,0 +1,13 @@
+import QtQuick 2.1
+import Test 1.0
+
+TabFence2 {
+    objectName: "root"
+    focus: true
+    width: 800
+    height: 600
+    Item {
+        objectName: "item"
+        focus: true
+    }
+}
diff --git a/tests/auto/quick/qquickitem2/data/qtbug_50516_2_2.qml b/tests/auto/quick/qquickitem2/data/qtbug_50516_2_2.qml
new file mode 100644
index 0000000000..445dc6d2a1
--- /dev/null
+++ b/tests/auto/quick/qquickitem2/data/qtbug_50516_2_2.qml
@@ -0,0 +1,12 @@
+import QtQuick 2.1
+import Test 1.0
+
+TabFence2 {
+    objectName: "root"
+    focus: true
+    width: 800
+    height: 600
+    Item {
+        objectName: "item"
+    }
+}
diff --git a/tests/auto/quick/qquickitem2/data/qtbug_50516_2_3.qml b/tests/auto/quick/qquickitem2/data/qtbug_50516_2_3.qml
new file mode 100644
index 0000000000..806d48ebeb
--- /dev/null
+++ b/tests/auto/quick/qquickitem2/data/qtbug_50516_2_3.qml
@@ -0,0 +1,16 @@
+import QtQuick 2.1
+import Test 1.0
+
+TabFence2 {
+    objectName: "root"
+    focus: true
+    width: 800
+    height: 600
+    Item {
+        objectName: "item2"
+        focus: true
+    }
+    Item {
+        objectName: "item2"
+    }
+}
diff --git a/tests/auto/quick/qquickitem2/data/qtbug_50516_2_4.qml b/tests/auto/quick/qquickitem2/data/qtbug_50516_2_4.qml
new file mode 100644
index 0000000000..6fcf513b51
--- /dev/null
+++ b/tests/auto/quick/qquickitem2/data/qtbug_50516_2_4.qml
@@ -0,0 +1,15 @@
+import QtQuick 2.1
+import Test 1.0
+
+TabFence2 {
+    objectName: "root"
+    focus: true
+    width: 800
+    height: 600
+    Item {
+        objectName: "item2"
+    }
+    Item {
+        objectName: "item2"
+    }
+}
diff --git a/tests/auto/quick/qquickitem2/data/qtbug_50516_2_5.qml b/tests/auto/quick/qquickitem2/data/qtbug_50516_2_5.qml
new file mode 100644
index 0000000000..4f7b68a8de
--- /dev/null
+++ b/tests/auto/quick/qquickitem2/data/qtbug_50516_2_5.qml
@@ -0,0 +1,16 @@
+import QtQuick 2.1
+import Test 1.0
+
+TabFence2 {
+    objectName: "root"
+    focus: true
+    width: 800
+    height: 600
+    TextInput {
+        objectName: "item1"
+        activeFocusOnTab: true
+    }
+    Item {
+        objectName: "item2"
+    }
+}
diff --git a/tests/auto/quick/qquickitem2/data/qtbug_50516_2_6.qml b/tests/auto/quick/qquickitem2/data/qtbug_50516_2_6.qml
new file mode 100644
index 0000000000..223476327a
--- /dev/null
+++ b/tests/auto/quick/qquickitem2/data/qtbug_50516_2_6.qml
@@ -0,0 +1,17 @@
+import QtQuick 2.1
+import Test 1.0
+
+TabFence2 {
+    objectName: "root"
+    focus: true
+    width: 800
+    height: 600
+    TextInput {
+        objectName: "item1"
+        activeFocusOnTab: true
+    }
+    TextInput {
+        objectName: "item2"
+        activeFocusOnTab: true
+    }
+}
diff --git a/tests/auto/quick/qquickitem2/tst_qquickitem.cpp b/tests/auto/quick/qquickitem2/tst_qquickitem.cpp
index 607dbccaed..b4131a2df8 100644
--- a/tests/auto/quick/qquickitem2/tst_qquickitem.cpp
+++ b/tests/auto/quick/qquickitem2/tst_qquickitem.cpp
@@ -70,6 +70,8 @@ private slots:
 
     void tabFence();
     void qtbug_50516();
+    void qtbug_50516_2_data();
+    void qtbug_50516_2();
 
     void keys();
     void standardKeys_data();
@@ -305,6 +307,22 @@ public:
 
 QML_DECLARE_TYPE(TabFenceItem);
 
+class TabFenceItem2 : public QQuickItem
+{
+    Q_OBJECT
+
+public:
+    TabFenceItem2(QQuickItem *parent = Q_NULLPTR)
+        : QQuickItem(parent)
+    {
+        QQuickItemPrivate *d = QQuickItemPrivate::get(this);
+        d->isTabFence = true;
+        setFlag(ItemIsFocusScope);
+    }
+};
+
+QML_DECLARE_TYPE(TabFenceItem2);
+
 tst_QQuickItem::tst_QQuickItem()
 {
 }
@@ -315,6 +333,7 @@ void tst_QQuickItem::initTestCase()
     qmlRegisterType<KeyTestItem>("Test",1,0,"KeyTestItem");
     qmlRegisterType<HollowTestItem>("Test", 1, 0, "HollowTestItem");
     qmlRegisterType<TabFenceItem>("Test", 1, 0, "TabFence");
+    qmlRegisterType<TabFenceItem2>("Test", 1, 0, "TabFence2");
 }
 
 void tst_QQuickItem::cleanup()
@@ -1212,6 +1231,51 @@ void tst_QQuickItem::qtbug_50516()
     delete window;
 }
 
+void tst_QQuickItem::qtbug_50516_2_data()
+{
+    QTest::addColumn<QString>("filename");
+    QTest::addColumn<QString>("item1");
+    QTest::addColumn<QString>("item2");
+
+    QTest::newRow("FocusScope TabFence with one Item(focused)")
+            << QStringLiteral("qtbug_50516_2_1.qml") << QStringLiteral("root") << QStringLiteral("root");
+    QTest::newRow("FocusScope TabFence with one Item(unfocused)")
+            << QStringLiteral("qtbug_50516_2_2.qml") << QStringLiteral("root") << QStringLiteral("root");
+    QTest::newRow("FocusScope TabFence with two Items(focused)")
+            << QStringLiteral("qtbug_50516_2_3.qml") << QStringLiteral("root") << QStringLiteral("root");
+    QTest::newRow("FocusScope TabFence with two Items(unfocused)")
+            << QStringLiteral("qtbug_50516_2_4.qml") << QStringLiteral("root") << QStringLiteral("root");
+    QTest::newRow("FocusScope TabFence with one Item and one TextInput(unfocused)")
+            << QStringLiteral("qtbug_50516_2_5.qml") << QStringLiteral("item1") << QStringLiteral("item1");
+    QTest::newRow("FocusScope TabFence with two TextInputs(unfocused)")
+            << QStringLiteral("qtbug_50516_2_6.qml") << QStringLiteral("item1") << QStringLiteral("item2");
+}
+
+void tst_QQuickItem::qtbug_50516_2()
+{
+    QFETCH(QString, filename);
+    QFETCH(QString, item1);
+    QFETCH(QString, item2);
+
+    QQuickView *window = new QQuickView(0);
+    window->setBaseSize(QSize(800,600));
+
+    window->setSource(testFileUrl(filename));
+    window->show();
+    window->requestActivate();
+    QVERIFY(QTest::qWaitForWindowActive(window));
+    QVERIFY(QGuiApplication::focusWindow() == window);
+    QVERIFY(window->rootObject()->hasActiveFocus());
+
+    QQuickItem *contentItem = window->rootObject();
+    QQuickItem *next = contentItem->nextItemInFocusChain(true);
+    QCOMPARE(next->objectName(), item1);
+    next = contentItem->nextItemInFocusChain(false);
+    QCOMPARE(next->objectName(), item2);
+
+    delete window;
+}
+
 void tst_QQuickItem::keys()
 {
     QQuickView *window = new QQuickView(0);
diff --git a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
index 405acad165..658ffa1f57 100644
--- a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
+++ b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
@@ -8264,99 +8264,9 @@ void tst_QQuickListView::keyNavigationEnabled()
     QCOMPARE(listView->currentIndex(), 1);
 }
 
-static bool testVisibleItems(const QQuickItemViewPrivate *priv, bool *nonUnique, FxViewItem **failItem, int *expectedIdx)
-{
-    QHash<QQuickItem*, int> uniqueItems;
-
-    int skip = 0;
-    for (int i = 0; i < priv->visibleItems.count(); ++i) {
-        FxViewItem *item = priv->visibleItems.at(i);
-        if (!item) {
-            *failItem = Q_NULLPTR;
-            return false;
-        }
-#if 0
-        qDebug() << "\t" << item->index
-                 << item->item
-                 << item->position()
-                 << (!item->item || QQuickItemPrivate::get(item->item)->culled ? "hidden" : "visible");
-#endif
-        if (item->index == -1) {
-            ++skip;
-        } else if (item->index != priv->visibleIndex + i - skip) {
-            *nonUnique = false;
-            *failItem = item;
-            *expectedIdx = priv->visibleIndex + i - skip;
-            return false;
-        } else if (uniqueItems.contains(item->item)) {
-            *nonUnique = true;
-            *failItem = item;
-            *expectedIdx = uniqueItems.find(item->item).value();
-            return false;
-        }
-
-        uniqueItems.insert(item->item, item->index);
-    }
-
-    return true;
-}
-
-class QTBUG_48870_Model : public QAbstractListModel
-{
-    Q_OBJECT
-
-public:
-
-    QTBUG_48870_Model()
-        : QAbstractListModel()
-        , m_rowCount(20)
-    {
-        QTimer *t = new QTimer(this);
-        t->setInterval(500);
-        t->start();
-
-        qsrand(qHash(QDateTime::currentDateTime()));
-        connect(t, &QTimer::timeout, this, &QTBUG_48870_Model::updateModel);
-    }
-
-    int rowCount(const QModelIndex &) const
-    {
-        return m_rowCount;
-    }
-
-    QVariant data(const QModelIndex &, int) const
-    {
-        return QVariant();
-    }
-
-public Q_SLOTS:
-    void updateModel()
-    {
-        if (m_rowCount > 10) {
-            for (int i = 0; i < 10; ++i) {
-                int rnum = qrand() % m_rowCount;
-                beginRemoveRows(QModelIndex(), rnum, rnum);
-                m_rowCount--;
-                endRemoveRows();
-            }
-        }
-        if (m_rowCount < 20) {
-            for (int i = 0; i < 10; ++i) {
-                int rnum = qrand() % m_rowCount;
-                beginInsertRows(QModelIndex(), rnum, rnum);
-                m_rowCount++;
-                endInsertRows();
-            }
-        }
-    }
-
-private:
-    int m_rowCount;
-};
-
 void tst_QQuickListView::QTBUG_48870_fastModelUpdates()
 {
-    QTBUG_48870_Model model;
+    StressTestModel model;
 
     QScopedPointer<QQuickView> window(createView());
     QQmlContext *ctxt = window->rootContext();
diff --git a/tests/auto/quick/shared/viewtestutil.cpp b/tests/auto/quick/shared/viewtestutil.cpp
index 09c88acbe6..ab58aee648 100644
--- a/tests/auto/quick/shared/viewtestutil.cpp
+++ b/tests/auto/quick/shared/viewtestutil.cpp
@@ -35,6 +35,7 @@
 #include <QtTest/QTest>
 
 #include <private/qquickwindow_p.h>
+#include <private/qquickitemview_p_p.h>
 
 
 QQuickView *QQuickViewTestUtil::createView()
@@ -347,6 +348,85 @@ QList<QPair<QString,QString> > QQuickViewTestUtil::ListRange::getModelDataValues
     return data;
 }
 
+QQuickViewTestUtil::StressTestModel::StressTestModel()
+    : QAbstractListModel()
+    , m_rowCount(20)
+{
+    QTimer *t = new QTimer(this);
+    t->setInterval(500);
+    t->start();
+
+    qsrand(qHash(QDateTime::currentDateTime()));
+    connect(t, &QTimer::timeout, this, &StressTestModel::updateModel);
+}
+
+int QQuickViewTestUtil::StressTestModel::rowCount(const QModelIndex &) const
+{
+    return m_rowCount;
+}
+
+QVariant QQuickViewTestUtil::StressTestModel::data(const QModelIndex &, int) const
+{
+    return QVariant();
+}
+
+void QQuickViewTestUtil::StressTestModel::updateModel()
+{
+    if (m_rowCount > 10) {
+        for (int i = 0; i < 10; ++i) {
+            int rnum = qrand() % m_rowCount;
+            beginRemoveRows(QModelIndex(), rnum, rnum);
+            m_rowCount--;
+            endRemoveRows();
+        }
+    }
+    if (m_rowCount < 20) {
+        for (int i = 0; i < 10; ++i) {
+            int rnum = qrand() % m_rowCount;
+            beginInsertRows(QModelIndex(), rnum, rnum);
+            m_rowCount++;
+            endInsertRows();
+        }
+    }
+}
+
+bool QQuickViewTestUtil::testVisibleItems(const QQuickItemViewPrivate *priv, bool *nonUnique, FxViewItem **failItem, int *expectedIdx)
+{
+    QHash<QQuickItem*, int> uniqueItems;
+
+    int skip = 0;
+    for (int i = 0; i < priv->visibleItems.count(); ++i) {
+        FxViewItem *item = priv->visibleItems.at(i);
+        if (!item) {
+            *failItem = Q_NULLPTR;
+            return false;
+        }
+#if 0
+        qDebug() << "\t" << item->index
+                 << item->item
+                 << item->position()
+                 << (!item->item || QQuickItemPrivate::get(item->item)->culled ? "hidden" : "visible");
+#endif
+        if (item->index == -1) {
+            ++skip;
+        } else if (item->index != priv->visibleIndex + i - skip) {
+            *nonUnique = false;
+            *failItem = item;
+            *expectedIdx = priv->visibleIndex + i - skip;
+            return false;
+        } else if (uniqueItems.contains(item->item)) {
+            *nonUnique = true;
+            *failItem = item;
+            *expectedIdx = uniqueItems.find(item->item).value();
+            return false;
+        }
+
+        uniqueItems.insert(item->item, item->index);
+    }
+
+    return true;
+}
+
 namespace QQuickTouchUtils {
 
     /* QQuickWindow does event compression and only delivers events just
diff --git a/tests/auto/quick/shared/viewtestutil.h b/tests/auto/quick/shared/viewtestutil.h
index 0f50180809..b11d5e4859 100644
--- a/tests/auto/quick/shared/viewtestutil.h
+++ b/tests/auto/quick/shared/viewtestutil.h
@@ -34,6 +34,8 @@
 #include <QtCore/QAbstractListModel>
 
 QT_FORWARD_DECLARE_CLASS(QQuickView)
+QT_FORWARD_DECLARE_CLASS(QQuickItemViewPrivate)
+QT_FORWARD_DECLARE_CLASS(FxViewItem)
 
 namespace QQuickViewTestUtil
 {
@@ -154,6 +156,26 @@ namespace QQuickViewTestUtil
         for (; f != replaced.end(); ++f, ++t)
             *t = *f;
     }
+
+    class StressTestModel : public QAbstractListModel
+    {
+        Q_OBJECT
+
+    public:
+
+        StressTestModel();
+
+        int rowCount(const QModelIndex &) const;
+        QVariant data(const QModelIndex &, int) const;
+
+    public Q_SLOTS:
+        void updateModel();
+
+    private:
+        int m_rowCount;
+    };
+
+    bool testVisibleItems(const QQuickItemViewPrivate *priv, bool *nonUnique, FxViewItem **failItem, int *expectedIdx);
 }
 
 namespace QQuickTouchUtils {