summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-05-26 03:00:52 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-05-26 03:00:53 +0200
commit6ab6f7a1be455d2f56c8f250c349b401056e5580 (patch)
tree52f8c8c2e418b4bfe6c6d7fec843e387d175fdd4 /tests
parenta2b9b53b8ec20199a440d574bac0ba7fb1c1042f (diff)
parent4aec7d14d57b10f7fc503644d3cad44d9f166322 (diff)
downloadqtquickcontrols-6ab6f7a1be455d2f56c8f250c349b401056e5580.tar.gz
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ie706f27a0c43ec1d1136310fba196d9b41a184ed
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/extras/BLACKLIST13
1 files changed, 0 insertions, 13 deletions
diff --git a/tests/auto/extras/BLACKLIST b/tests/auto/extras/BLACKLIST
deleted file mode 100644
index daa663dc..00000000
--- a/tests/auto/extras/BLACKLIST
+++ /dev/null
@@ -1,13 +0,0 @@
-[Tests_StatusIndicator::test_active]
-*
-[Tests_StatusIndicator::test_baseStyleHasOuterShadow]
-*
-[Tests_StatusIndicator::test_color]
-*
-
-[Tests_Tumbler::test_focusPastLastColumn]
-*
-[Tests_Tumbler::test_itemsCorrectlyPositioned]
-*
-[Tests_Tumbler::test_keyboardNavigation]
-*