diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-23 01:00:43 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-23 01:00:44 +0100 |
commit | bbea1b8a3a7742e8abf3e3c1c4a08828ec0f663a (patch) | |
tree | 75cf85396de2ad99deeeb457202bf0fb0e14409b /tests/auto/quick/qquicklistview | |
parent | 1ee5fed75f07ac63fe6f0463fca72af672304ddb (diff) | |
parent | 6597d990147d21d55449302cb3201e4769e15a2a (diff) |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I88e94fe3398a59f10c5a8b142204db5f3ccb2657
Diffstat (limited to 'tests/auto/quick/qquicklistview')
-rw-r--r-- | tests/auto/quick/qquicklistview/BLACKLIST | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/quick/qquicklistview/BLACKLIST b/tests/auto/quick/qquicklistview/BLACKLIST index 1f3736328a..6ef69550a4 100644 --- a/tests/auto/quick/qquicklistview/BLACKLIST +++ b/tests/auto/quick/qquicklistview/BLACKLIST @@ -5,10 +5,10 @@ opensuse-leap [populateTransitions] opensuse-42.1 [contentHeightWithDelayRemove] -osx-10.12 +macos #QTBUG-75960 #QTBUG-76652 [currentIndex] -osx-10.12 +macos opensuse-leap ubuntu-18.04 |