summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-05-19 03:01:25 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-05-19 03:01:26 +0200
commita2b9b53b8ec20199a440d574bac0ba7fb1c1042f (patch)
treedba7c0e1ceaf1d1865be2e4e8b6f661dd3aa5e3f
parentaa31ad15010aae654c61d624fa6161a2e64faa54 (diff)
parent0c40c9dae7c944bbf48c00c32a046a879fa0e7ac (diff)
downloadqtquickcontrols-a2b9b53b8ec20199a440d574bac0ba7fb1c1042f.tar.gz
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I4194dd92ef851407e667bd1c635367a1bae97480
-rw-r--r--tests/auto/extras/BLACKLIST7
1 files changed, 7 insertions, 0 deletions
diff --git a/tests/auto/extras/BLACKLIST b/tests/auto/extras/BLACKLIST
index 3a502904..daa663dc 100644
--- a/tests/auto/extras/BLACKLIST
+++ b/tests/auto/extras/BLACKLIST
@@ -1,3 +1,10 @@
+[Tests_StatusIndicator::test_active]
+*
+[Tests_StatusIndicator::test_baseStyleHasOuterShadow]
+*
+[Tests_StatusIndicator::test_color]
+*
+
[Tests_Tumbler::test_focusPastLastColumn]
*
[Tests_Tumbler::test_itemsCorrectlyPositioned]