summaryrefslogtreecommitdiff
path: root/tests/auto/controls/data/tst_scrollview.qml
diff options
context:
space:
mode:
authorCaroline Chao <caroline.chao@digia.com>2013-03-07 10:06:27 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-03-07 18:32:44 +0100
commit060a6afdf851ca4dbe05f19f3ad3cd486740fafa (patch)
tree959ac2c30ea336b5c96f84529be344e2018aaabd /tests/auto/controls/data/tst_scrollview.qml
parent8c74c603e9bfcc7bb19366df1cc2ef3f4ed6cb1f (diff)
downloadqtquickcontrols-060a6afdf851ca4dbe05f19f3ad3cd486740fafa.tar.gz
ScrollView: Fix when the item added is not a Flickable
The Flickable item created becomes the parent of the ScrollView contentItem. Change-Id: I488d9f8ffc02a1de1158b279e0971473a3386e2c Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Diffstat (limited to 'tests/auto/controls/data/tst_scrollview.qml')
-rw-r--r--tests/auto/controls/data/tst_scrollview.qml2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/controls/data/tst_scrollview.qml b/tests/auto/controls/data/tst_scrollview.qml
index 1d8651ed..05519f6e 100644
--- a/tests/auto/controls/data/tst_scrollview.qml
+++ b/tests/auto/controls/data/tst_scrollview.qml
@@ -66,7 +66,7 @@ TestCase {
scrollView.contentItem = bigItem
scrollView.visible = true
- verify(scrollView.flickableItem, "flickableItem should not be null")
+ verify(scrollView.flickableItem !== null, "flickableItem should not be null")
verify(scrollView.flickableItem !== scrollView.contentItem)
verify(scrollView.flickableItem.contentHeight === 0, "ContentHeight not set")