diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-11 08:53:58 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-11 08:53:58 +0100 |
| commit | d5ab3ab8703ef04cc06d78983bf1a39ecfe99bb4 (patch) | |
| tree | 33e55f0cba22d73a7207b6237156daca1dcd624e /tests/auto/integration/qmediaplayerbackend/BLACKLIST | |
| parent | 0cb4dc5c1fded81b4f47945b51b8de0b0151bf67 (diff) | |
| parent | d3a2d9c96994c56d67467c131b8f080510d1a8fd (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
qtmultimedia.pro
src/multimedia/playback/qmediaplayer.cpp
src/plugins/directshow/directshow.pro
tests/auto/integration/qmediaplayerbackend/BLACKLIST
Change-Id: I6dacdcbb223c1d12dd72eb308a67170983c709b3
Diffstat (limited to 'tests/auto/integration/qmediaplayerbackend/BLACKLIST')
| -rw-r--r-- | tests/auto/integration/qmediaplayerbackend/BLACKLIST | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/tests/auto/integration/qmediaplayerbackend/BLACKLIST b/tests/auto/integration/qmediaplayerbackend/BLACKLIST index 5560abf75..e826fc079 100644 --- a/tests/auto/integration/qmediaplayerbackend/BLACKLIST +++ b/tests/auto/integration/qmediaplayerbackend/BLACKLIST @@ -7,15 +7,13 @@ osx-10.11 windows 32bit developer-build windows 64bit developer-build -[construction] +# Media player plugin not built at the moment on this platform opensuse-13.1 64bit [loadMedia] -opensuse-13.1 64bit windows 64bit developer-build [unloadMedia] -opensuse-13.1 64bit windows 64bit developer-build [playPauseStop] @@ -23,25 +21,15 @@ linux windows 64bit developer-build [processEOS] -opensuse-13.1 64bit windows 64bit developer-build [deleteLaterAtEOS] -opensuse-13.1 64bit windows 64bit developer-build -[volumeAndMuted] -opensuse-13.1 64bit - -[volumeAcrossFiles] -opensuse-13.1 64bit - [initialVolume] -opensuse-13.1 64bit windows 64bit developer-build [playlist] -opensuse-13.1 64bit redhatenterpriselinuxworkstation-6.6 [seekPauseSeek] |