diff options
| author | Christian Strømme <christian.stromme@theqtcompany.com> | 2016-01-15 17:27:32 +0100 |
|---|---|---|
| committer | Christian Strømme <christian.stromme@theqtcompany.com> | 2016-01-15 17:28:17 +0100 |
| commit | 84e426c3af2a3bb1b7f916e54263aea758db38d0 (patch) | |
| tree | 4fe09a8da5b15ba466e5771239d06f29a6c123da /tests/auto/integration/qaudiodecoderbackend/BLACKLIST | |
| parent | 84aaa48fdfc1f35c9870518a3d4b6f08a1f99449 (diff) | |
| parent | 924dc7f48c7003b46079623738ae531f34aed903 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
src/plugins/android/src/mediacapture/qandroidcamerasession.cpp
src/plugins/wmf/mftvideo.cpp
Change-Id: I78868b416ea4baec89ca3e2dc9eb4712db16d5fc
Diffstat (limited to 'tests/auto/integration/qaudiodecoderbackend/BLACKLIST')
| -rw-r--r-- | tests/auto/integration/qaudiodecoderbackend/BLACKLIST | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/auto/integration/qaudiodecoderbackend/BLACKLIST b/tests/auto/integration/qaudiodecoderbackend/BLACKLIST index bd2349568..038b89022 100644 --- a/tests/auto/integration/qaudiodecoderbackend/BLACKLIST +++ b/tests/auto/integration/qaudiodecoderbackend/BLACKLIST @@ -6,6 +6,7 @@ redhatenterpriselinuxworkstation-6.6 osx-10.8 osx-10.9 osx-10.10 +osx-10.11 windows 32bit developer-build windows 64bit developer-build @@ -15,6 +16,7 @@ redhatenterpriselinuxworkstation-6.6 osx-10.8 osx-10.9 osx-10.10 +osx-10.11 windows 32bit developer-build windows 64bit developer-build @@ -24,6 +26,7 @@ redhatenterpriselinuxworkstation-6.6 osx-10.8 osx-10.9 osx-10.10 +osx-10.11 windows 32bit developer-build windows 64bit developer-build @@ -33,5 +36,6 @@ redhatenterpriselinuxworkstation-6.6 osx-10.8 osx-10.9 osx-10.10 +osx-10.11 windows 32bit developer-build windows 64bit developer-build |