diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-11 18:57:46 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-06-11 18:57:46 +0200 |
| commit | 579a7d620284c277966e590518374aefa141c481 (patch) | |
| tree | 9801d1258eeeca2c1aab6d818b201be9d582d359 /tests/auto/integration | |
| parent | 0eced38ea5cc5d00b6138ede3902fb6d33823966 (diff) | |
| parent | 62d9b69e4d9ee9f180e4ac07fb72e00a002d3c02 (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: Iffd8d86489161c49a647cae77a31f5451b06cf4b
Diffstat (limited to 'tests/auto/integration')
| -rw-r--r-- | tests/auto/integration/qaudioinput/BLACKLIST | 1 | ||||
| -rw-r--r-- | tests/auto/integration/qmediaplayerbackend/BLACKLIST | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/integration/qaudioinput/BLACKLIST b/tests/auto/integration/qaudioinput/BLACKLIST index f6a8a670f..ab3f9e037 100644 --- a/tests/auto/integration/qaudioinput/BLACKLIST +++ b/tests/auto/integration/qaudioinput/BLACKLIST @@ -3,5 +3,6 @@ redhatenterpriselinuxworkstation-6.6 rhel-7.2 ubuntu-14.04 +ubuntu-16.04 opensuse-13.1 opensuse-42.1 diff --git a/tests/auto/integration/qmediaplayerbackend/BLACKLIST b/tests/auto/integration/qmediaplayerbackend/BLACKLIST index 7ce72c7ac..43b8e8b26 100644 --- a/tests/auto/integration/qmediaplayerbackend/BLACKLIST +++ b/tests/auto/integration/qmediaplayerbackend/BLACKLIST @@ -23,6 +23,7 @@ opensuse-13.1 64bit redhatenterpriselinuxworkstation-6.6 rhel-7.1 ubuntu-14.04 64bit +ubuntu-16.04 64bit windows 64bit developer-build rhel-7.2 |