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

Change-Id: Ia02971527a2d1a80c5624d69330428818aab3a41

1 files changed, 13 insertions, 0 deletions

diff --git a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
index 9bcf9d6333..65892ddd9b 100644
--- a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
+++ b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
@@ -206,6 +206,7 @@ private slots:
     void destroyItemOnCreation();
 
     void parentBinding();
+    void defaultHighlightMoveDuration();
 
 private:
     template <class T> void items(const QUrl &source, bool forceLayout);
@@ -6801,6 +6802,18 @@ void tst_QQuickListView::parentBinding()
     delete window;
 }
 
+void tst_QQuickListView::defaultHighlightMoveDuration()
+{
+    QQmlEngine engine;
+    QQmlComponent component(&engine);
+    component.setData("import QtQuick 2.0; ListView {}", QUrl::fromLocalFile(""));
+
+    QObject *obj = component.create();
+    QVERIFY(obj);
+
+    QCOMPARE(obj->property("highlightMoveDuration").toInt(), -1);
+}
+
 QTEST_MAIN(tst_QQuickListView)
 
 #include "tst_qquicklistview.moc"