summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-03-02 03:03:56 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-03-02 03:03:56 +0100
commitf984a80d055e4c9bbd2224d0db54f4233838591b (patch)
tree509205cdd02f364ab00e71d7d5e9edb16a680c45
parentb25c47d109e5c000ad314ecf1f8a499e6f4a1e9f (diff)
parent6b62b506d6eb06271e082dcedaf75fd588a5b17c (diff)
downloadqtquickcontrols-f984a80d055e4c9bbd2224d0db54f4233838591b.tar.gz
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: Ifadabd58a40ded90fc0728d32477179976ca1527
-rw-r--r--tests/auto/controls/data/tst_scrollview.qml2
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/controls/data/tst_scrollview.qml b/tests/auto/controls/data/tst_scrollview.qml
index 95aa6e98..a3c8eab3 100644
--- a/tests/auto/controls/data/tst_scrollview.qml
+++ b/tests/auto/controls/data/tst_scrollview.qml
@@ -179,6 +179,8 @@ TestCase {
}
function test_dragFetchAppend() { // QTBUG-50795
+ skip("This is flaky: QTBUG-55727. Can't use BLACKLIST because of QTBUG-74117.")
+
var scrollView = dragFetchAppendComponent.createObject(container)
verify(scrollView !== null, "view created is null")
waitForRendering(scrollView)