aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorBea Lam <bea.lam@nokia.com>2012-06-20 17:08:56 +1000
committerQt by Nokia <qt-info@nokia.com>2012-06-22 08:18:15 +0200
commit18fb5506d524dbe380d5bf636c74c93fb85cbc31 (patch)
tree64c2589db60c93ac4825d6ae41715a0ee0133461 /tests
parent188b4e0202c4e4d5950d440721bdd6ef7c4ecbe3 (diff)
Remove properties related to highlight speed
ListView should only have duration-type properties (i.e. highlightMoveDuration and highlightResizeDuration) as it's unnecessary to have both duration and speed properties for the highlight animation. (PathView and GridView only have the duration-related properties.) Change-Id: I1b94599e3e89afe6488ce2a882c2802354a859fe Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/quick/qquicklistview/data/displaylist.qml2
-rw-r--r--tests/auto/quick/qquicklistview/data/flickBeyondBoundsBug.qml2
-rw-r--r--tests/auto/quick/qquicklistview/data/listview-initCurrent.qml1
-rw-r--r--tests/auto/quick/qquicklistview/data/listview-noCurrent.qml1
-rw-r--r--tests/auto/quick/qquicklistview/data/listviewtest-package.qml2
-rw-r--r--tests/auto/quick/qquicklistview/data/listviewtest.qml2
-rw-r--r--tests/auto/quick/qquicklistview/tst_qquicklistview.cpp3
7 files changed, 0 insertions, 13 deletions
diff --git a/tests/auto/quick/qquicklistview/data/displaylist.qml b/tests/auto/quick/qquicklistview/data/displaylist.qml
index 4e8fd32f6a..6ac56f8630 100644
--- a/tests/auto/quick/qquicklistview/data/displaylist.qml
+++ b/tests/auto/quick/qquicklistview/data/displaylist.qml
@@ -44,7 +44,5 @@ Rectangle {
model: testModel
delegate: myDelegate
highlight: myHighlight
- highlightMoveSpeed: 1000
- highlightResizeSpeed: 1000
}
}
diff --git a/tests/auto/quick/qquicklistview/data/flickBeyondBoundsBug.qml b/tests/auto/quick/qquicklistview/data/flickBeyondBoundsBug.qml
index 0a1b1a1b64..17f787c595 100644
--- a/tests/auto/quick/qquicklistview/data/flickBeyondBoundsBug.qml
+++ b/tests/auto/quick/qquicklistview/data/flickBeyondBoundsBug.qml
@@ -35,8 +35,6 @@ Rectangle {
height: 320
model: 2
delegate: myDelegate
- highlightMoveSpeed: 1000
- highlightResizeSpeed: 1000
cacheBuffer: 400
}
Text { anchors.bottom: parent.bottom; text: list.contentY }
diff --git a/tests/auto/quick/qquicklistview/data/listview-initCurrent.qml b/tests/auto/quick/qquicklistview/data/listview-initCurrent.qml
index c4f1860eda..1f6cccddca 100644
--- a/tests/auto/quick/qquicklistview/data/listview-initCurrent.qml
+++ b/tests/auto/quick/qquicklistview/data/listview-initCurrent.qml
@@ -56,7 +56,6 @@ Rectangle {
height: 320
keyNavigationWraps: testWrap
delegate: myDelegate
- highlightMoveSpeed: 1000
model: testModel
header: root.showHeader ? headerFooter : null
footer: root.showFooter ? headerFooter : null
diff --git a/tests/auto/quick/qquicklistview/data/listview-noCurrent.qml b/tests/auto/quick/qquicklistview/data/listview-noCurrent.qml
index cb9030090e..9aac5064fa 100644
--- a/tests/auto/quick/qquicklistview/data/listview-noCurrent.qml
+++ b/tests/auto/quick/qquicklistview/data/listview-noCurrent.qml
@@ -45,7 +45,6 @@ Rectangle {
height: 320
cacheBuffer: 0
delegate: myDelegate
- highlightMoveSpeed: 1000
model: testModel
}
}
diff --git a/tests/auto/quick/qquicklistview/data/listviewtest-package.qml b/tests/auto/quick/qquicklistview/data/listviewtest-package.qml
index 54d4dabc86..87179d51e1 100644
--- a/tests/auto/quick/qquicklistview/data/listviewtest-package.qml
+++ b/tests/auto/quick/qquicklistview/data/listviewtest-package.qml
@@ -136,8 +136,6 @@ Rectangle {
height: 320
model: visualModel.parts.package
highlight: testObject.invalidHighlight ? invalidHl : myHighlight
- highlightMoveSpeed: 1000
- highlightResizeSpeed: 1000
cacheBuffer: testObject.cacheBuffer
header: root.showHeader ? headerFooter : null
footer: root.showFooter ? headerFooter : null
diff --git a/tests/auto/quick/qquicklistview/data/listviewtest.qml b/tests/auto/quick/qquicklistview/data/listviewtest.qml
index 47b341c1fc..29f9b92cb2 100644
--- a/tests/auto/quick/qquicklistview/data/listviewtest.qml
+++ b/tests/auto/quick/qquicklistview/data/listviewtest.qml
@@ -124,8 +124,6 @@ Rectangle {
model: testModel
delegate: testObject.animate ? animatedDelegate : myDelegate
highlight: testObject.invalidHighlight ? invalidHl : myHighlight
- highlightMoveSpeed: 1000
- highlightResizeSpeed: 1000
cacheBuffer: testObject.cacheBuffer
header: root.showHeader ? headerFooter : null
footer: root.showFooter ? headerFooter : null
diff --git a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
index dd6f82abe3..503d0b0c96 100644
--- a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
+++ b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
@@ -405,9 +405,6 @@ void tst_QQuickListView::items(const QUrl &source, bool forceLayout)
int itemCount = findItems<QQuickItem>(contentItem, "wrapper").count();
QTRY_VERIFY(itemCount == 0);
- QTRY_COMPARE(listview->highlightResizeSpeed(), 1000.0);
- QTRY_COMPARE(listview->highlightMoveSpeed(), 1000.0);
-
delete canvas;
delete testObject;
}