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

Change-Id: I59343fe228ca6b823b61577e5a0907e7381899c2

1 files changed, 30 insertions, 0 deletions

diff --git a/tests/auto/quick/qquickanimations/tst_qquickanimations.cpp b/tests/auto/quick/qquickanimations/tst_qquickanimations.cpp
index 181d40e9ce..17dfa4a3d7 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"