diff options
author | Michael Brasser <michael.brasser@live.com> | 2013-02-21 08:46:56 -0600 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-22 14:35:10 +0100 |
commit | 523bf6c3d0076e43aee6747211f6e93005f2d1c6 (patch) | |
tree | be573fd6f9d71f1be275adc183c13efcbd7e27dd | |
parent | 6ad4a61d482d895d135a7a281115bf104e0b9a90 (diff) |
ListView's highlightMoveDuration should default to -1.
Change-Id: Ibb53cc21b4f1f301569cd7724c60cb8df978921a
Reviewed-by: Bea Lam <bea.lam@jollamobile.com>
-rw-r--r-- | src/quick/items/qquicklistview.cpp | 4 | ||||
-rw-r--r-- | tests/auto/quick/qquicklistview/tst_qquicklistview.cpp | 13 |
2 files changed, 16 insertions, 1 deletions
diff --git a/src/quick/items/qquicklistview.cpp b/src/quick/items/qquicklistview.cpp index 57f1b99456..63528ff702 100644 --- a/src/quick/items/qquicklistview.cpp +++ b/src/quick/items/qquicklistview.cpp @@ -172,7 +172,9 @@ public: , highlightMoveVelocity(400), highlightResizeVelocity(400), highlightResizeDuration(-1) , sectionCriteria(0), currentSectionItem(0), nextSectionItem(0) , overshootDist(0.0), correctFlick(false), inFlickCorrection(false) - {} + { + highlightMoveDuration = -1; //override default value set in base class + } ~QQuickListViewPrivate() { delete highlightPosAnimator; delete highlightSizeAnimator; diff --git a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp index 9fad01ef40..c034fe83c8 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" |