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

 Conflicts:
	src/imports/imports.pro
	src/qml/qml/qqmlmetatype.cpp

Change-Id: I308436caf55402cb2246cb591c6ac8f83e1febf8

6 files changed, 197 insertions, 0 deletions

diff --git a/tests/auto/quick/qquickanimations/data/fastFlickingBug.qml b/tests/auto/quick/qquickanimations/data/fastFlickingBug.qml
new file mode 100644
index 0000000000..b2649a801b
--- /dev/null
+++ b/tests/auto/quick/qquickanimations/data/fastFlickingBug.qml
@@ -0,0 +1,114 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtCore 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 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 Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** 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-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+import QtQuick 2.11
+import QtQuick.Window 2.11
+
+Window {
+    id: root
+    property alias timer : timer
+    property alias listView : listView
+    property alias theModel: theModel
+    property variant ops: [{'op': 'add', 'count': 30}, {'op': 'add', 'count': 60}, {'op': 'rem', 'count': 40}, {'op': 'rem', 'count': 10}, {'op': 'rem', 'count': 39},
+    {'op': 'add', 'count': 30}, {'op': 'add', 'count': 60}, {'op': 'rem', 'count': 40}, {'op': 'rem', 'count': 10}, {'op': 'rem', 'count': 39},
+    {'op': 'add', 'count': 30}, {'op': 'add', 'count': 60}, {'op': 'rem', 'count': 40}, {'op': 'rem', 'count': 10}, {'op': 'rem', 'count': 39},
+    {'op': 'add', 'count': 30}, {'op': 'add', 'count': 60}, {'op': 'rem', 'count': 40}, {'op': 'rem', 'count': 10}, {'op': 'rem', 'count': 39},
+    {'op': 'add', 'count': 30}, {'op': 'add', 'count': 60}, {'op': 'rem', 'count': 40}, {'op': 'rem', 'count': 10}, {'op': 'rem', 'count': 39},
+    {'op': 'add', 'count': 30}, {'op': 'add', 'count': 60}, {'op': 'rem', 'count': 40}, {'op': 'rem', 'count': 10}, {'op': 'rem', 'count': 39},
+    {'op': 'add', 'count': 30}, {'op': 'add', 'count': 60}, {'op': 'rem', 'count': 40}, {'op': 'rem', 'count': 10}, {'op': 'rem', 'count': 39}]
+    property int opIndex : 0
+    width: 400
+    height: 600
+
+    ListModel {
+        id: theModel
+    }
+
+    Timer {
+        id: timer
+        interval: 100
+        running: false
+        repeat: true
+        onTriggered: {
+            if (opIndex >= ops.length) {
+                timer.stop()
+                return
+            }
+            let op = ops[opIndex]
+            for (var i = 0; i < op.count; ++i) {
+                if (op.op === "add")
+                    theModel.append({"name": "opIndex " + opIndex})
+                else
+                    theModel.remove(0, 1);
+            }
+            opIndex = opIndex + 1
+        }
+    }
+
+    ListView {
+        id: listView
+        anchors.fill: parent
+        spacing: 4
+        model: theModel
+        header: Text {
+            text: "YAnimator"
+        }
+        add: Transition {
+            NumberAnimation { property: "scale";   from: 0; to: 1; duration: 200 }
+            NumberAnimation { property: "opacity"; from: 0; to: 1; duration: 200 }
+        }
+        displaced: Transition {
+            YAnimator { duration: 500 }
+            NumberAnimation { property: "opacity"; to: 1.0; duration: 1000 }
+            NumberAnimation { property: "scale";   to: 1.0; duration: 1000 }
+        }
+        remove: Transition {
+            NumberAnimation { property: "opacity"; to: 0; duration: 200 }
+            NumberAnimation { property: "scale";   to: 0; duration: 200 }
+        }
+        delegate: Rectangle {
+            width: 200
+            height: 20
+            color:"red"
+            Text {
+                anchors.centerIn: parent
+                text: name
+            }
+        }
+    }
+}
diff --git a/tests/auto/quick/qquickanimations/qquickanimations.pro b/tests/auto/quick/qquickanimations/qquickanimations.pro
index d3c5f30dcf..94f694181d 100644
--- a/tests/auto/quick/qquickanimations/qquickanimations.pro
+++ b/tests/auto/quick/qquickanimations/qquickanimations.pro
@@ -27,6 +27,7 @@ OTHER_FILES += \
     data/dotproperty.qml \
     data/Double.qml \
     data/doubleRegistrationBug.qml \
+    data/fastFlickingBug.qml \
     data/looping.qml \
     data/mixedtype1.qml \
     data/mixedtype2.qml \
diff --git a/tests/auto/quick/qquickanimations/tst_qquickanimations.cpp b/tests/auto/quick/qquickanimations/tst_qquickanimations.cpp
index f5faa14265..48f779a490 100644
--- a/tests/auto/quick/qquickanimations/tst_qquickanimations.cpp
+++ b/tests/auto/quick/qquickanimations/tst_qquickanimations.cpp
@@ -40,6 +40,7 @@
 #include <QtQuick/private/qquickanimatorjob_p.h>
 #include <QtQuick/private/qquickpathinterpolator_p.h>
 #include <QtQuick/private/qquickitem_p.h>
+#include <QtQuick/private/qquicklistview_p.h>
 #include <QEasingCurve>
 
 #include <limits.h>
@@ -110,6 +111,7 @@ private slots:
     void finished();
     void replacingTransitions();
     void animationJobSelfDestruction();
+    void fastFlickingBug();
 };
 
 #define QTIMED_COMPARE(lhs, rhs) do { \
@@ -1744,6 +1746,34 @@ void tst_qquickanimations::animationJobSelfDestruction()
     QTest::qWait(1000);
 }
 
+void tst_qquickanimations::fastFlickingBug()
+{
+    // Don't crash
+    QQmlEngine engine;
+    engine.clearComponentCache();
+    QQmlComponent c(&engine, testFileUrl("fastFlickingBug.qml"));
+    QScopedPointer<QQuickWindow> win(qobject_cast<QQuickWindow*>(c.create()));
+    if (!c.errors().isEmpty())
+        qDebug() << c.errorString();
+    QVERIFY(win);
+    win->setTitle(QTest::currentTestFunction());
+    win->show();
+    QVERIFY(QTest::qWaitForWindowExposed(win.data()));
+    auto timer = win->property("timer").value<QQmlTimer*>();
+    QVERIFY(timer);
+    QCOMPARE(timer->isRunning(), false);
+    auto listView = win->property("listView").value<QQuickFlickable*>();
+    QVERIFY(listView);
+    timer->start();
+    // flick listView up and down quickly in the middle of a slow transition
+    for (int sign = 1; timer->isRunning(); sign *= -1) {
+        listView->flick(0, sign * 4000);
+        qApp->processEvents();
+        QTest::qWait(53);
+        qApp->processEvents();
+    }
+}
+
 QTEST_MAIN(tst_qquickanimations)
 
 #include "tst_qquickanimations.moc"
diff --git a/tests/auto/quick/qquicklistview/BLACKLIST b/tests/auto/quick/qquicklistview/BLACKLIST
index 6598323e22..1f3736328a 100644
--- a/tests/auto/quick/qquicklistview/BLACKLIST
+++ b/tests/auto/quick/qquicklistview/BLACKLIST
@@ -7,5 +7,8 @@ opensuse-42.1
 [contentHeightWithDelayRemove]
 osx-10.12
 #QTBUG-75960
+#QTBUG-76652
 [currentIndex]
 osx-10.12
+opensuse-leap
+ubuntu-18.04
diff --git a/tests/auto/quick/qquicklistview/data/footer2.qml b/tests/auto/quick/qquicklistview/data/footer2.qml
new file mode 100644
index 0000000000..bba74d89f7
--- /dev/null
+++ b/tests/auto/quick/qquicklistview/data/footer2.qml
@@ -0,0 +1,33 @@
+import QtQuick 2.0
+
+Rectangle {
+    width: 240
+    height: 320
+
+    Timer {
+        running: true
+        repeat: false
+        interval: 100
+        onTriggered: {
+            list.model -= 3;
+        }
+    }
+
+    ListView {
+        id: list
+        objectName: "list"
+        anchors.fill: parent
+        model: 3
+        delegate: Rectangle {
+            color: "red"
+            width: 240
+            height: 10
+        }
+        footer: Rectangle {
+            color: "blue"
+            width: 240
+            height: 10
+        }
+    }
+}
+
diff --git a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
index 7d5ad1b604..f14a6e75f6 100644
--- a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
+++ b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
@@ -153,6 +153,7 @@ private slots:
     void headerChangesViewport();
     void footer();
     void footer_data();
+    void footer2();
     void extents();
     void extents_data();
     void resetModel_headerFooter();
@@ -4139,6 +4140,21 @@ void tst_QQuickListView::footer_data()
         << QPointF(0, -(30 * 20) - 10);
 }
 
+void tst_QQuickListView::footer2() // QTBUG-31677
+{
+    QQuickView *window = getView();
+    window->setSource(testFileUrl("footer2.qml"));
+    window->show();
+    QVERIFY(QTest::qWaitForWindowExposed(window));
+
+    QQuickListView *listview = findItem<QQuickListView>(window->rootObject(), "list");
+    QTRY_VERIFY(listview != nullptr);
+
+    QQuickItem *footer = listview->footerItem();
+    QVERIFY(footer != nullptr);
+    QTRY_COMPARE(footer->y(), 0.0);
+}
+
 class LVAccessor : public QQuickListView
 {
 public: