summaryrefslogtreecommitdiffstats
path: root/tests/auto/integration/qsoundeffect
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2016-02-15 20:58:35 +0100
committerLiang Qi <liang.qi@theqtcompany.com>2016-02-15 20:58:35 +0100
commit9500aadc219481d89d32e5c2a2de10b0740c50de (patch)
tree2555f3bf593f772637ecc135b90b8778869e48f2 /tests/auto/integration/qsoundeffect
parent7610f6e9ba8b92df6d18b94fcec982064dffacbd (diff)
parentdd7c19ea9d6be922faca57013b06b0f2b0787169 (diff)
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-alpha1
Conflicts: .qmake.conf Change-Id: If5d9ea0fb6187bb6f74881289ebb15a57eb82e0c
Diffstat (limited to 'tests/auto/integration/qsoundeffect')
-rw-r--r--tests/auto/integration/qsoundeffect/BLACKLIST1
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/auto/integration/qsoundeffect/BLACKLIST b/tests/auto/integration/qsoundeffect/BLACKLIST
index f290cc8ff..1feeb4b5f 100644
--- a/tests/auto/integration/qsoundeffect/BLACKLIST
+++ b/tests/auto/integration/qsoundeffect/BLACKLIST
@@ -3,4 +3,5 @@
[testLooping]
ubuntu-14.04 64bit
redhatenterpriselinuxworkstation-6.6
+rhel-7.1
opensuse-13.1