diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-06 09:47:33 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-06 09:47:33 +0100 |
| commit | 7a3b8907060123fe5d487d4c9ba3a1e222f468bb (patch) | |
| tree | cb419d68eedddc1adbd6dbb84888767edc7fb3bf /tests | |
| parent | 4a6f459d193b621a77e002944eb28e4e96f2e2c7 (diff) | |
| parent | 13df2988efbe9a82225ccbf4cad463391d94c8e8 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
.qmake.conf
Change-Id: I3d6e69f3f99b2f0a0e2c29ffdd02176e1f22304e
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/integration/qmediaplayerbackend/BLACKLIST | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/auto/integration/qmediaplayerbackend/BLACKLIST b/tests/auto/integration/qmediaplayerbackend/BLACKLIST index 8aa622881..0a88eef9e 100644 --- a/tests/auto/integration/qmediaplayerbackend/BLACKLIST +++ b/tests/auto/integration/qmediaplayerbackend/BLACKLIST @@ -1,8 +1,7 @@ # QTBUG-46368 osx -windows 32bit developer-build -windows 64bit developer-build +windows # Media player plugin not built at the moment on this platform opensuse-13.1 64bit |