diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-10 19:26:21 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-10 19:26:21 +0200 |
| commit | 08e13bfcdb23eabfbc47bca7499b0b8aadce0ac7 (patch) | |
| tree | 406ffa7e3ae0a346a14175ccccb8ac7e596d8f8f /tests | |
| parent | fa9fe9ff8c3aba25fbae4f8f32588dd6477d6df8 (diff) | |
| parent | f0e0d5d901d4e28fff9f29caf86ada84906b3db4 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/plugins/winrt/qwinrtcameracontrol.cpp
Change-Id: I45d3042adf19577a72794610fa1c310cb22e26c4
Diffstat (limited to 'tests')
3 files changed, 8 insertions, 47 deletions
diff --git a/tests/auto/integration/qaudiodecoderbackend/BLACKLIST b/tests/auto/integration/qaudiodecoderbackend/BLACKLIST deleted file mode 100644 index 038b89022..000000000 --- a/tests/auto/integration/qaudiodecoderbackend/BLACKLIST +++ /dev/null @@ -1,41 +0,0 @@ -# QTBUG-46331 - -[fileTest] -opensuse-13.1 64bit -redhatenterpriselinuxworkstation-6.6 -osx-10.8 -osx-10.9 -osx-10.10 -osx-10.11 -windows 32bit developer-build -windows 64bit developer-build - -[unsupportedFileTest] -opensuse-13.1 64bit -redhatenterpriselinuxworkstation-6.6 -osx-10.8 -osx-10.9 -osx-10.10 -osx-10.11 -windows 32bit developer-build -windows 64bit developer-build - -[corruptedFileTest] -opensuse-13.1 64bit -redhatenterpriselinuxworkstation-6.6 -osx-10.8 -osx-10.9 -osx-10.10 -osx-10.11 -windows 32bit developer-build -windows 64bit developer-build - -[deviceTest] -opensuse-13.1 64bit -redhatenterpriselinuxworkstation-6.6 -osx-10.8 -osx-10.9 -osx-10.10 -osx-10.11 -windows 32bit developer-build -windows 64bit developer-build diff --git a/tests/auto/integration/qaudiodecoderbackend/tst_qaudiodecoderbackend.cpp b/tests/auto/integration/qaudiodecoderbackend/tst_qaudiodecoderbackend.cpp index 576da50e3..2af06b46c 100644 --- a/tests/auto/integration/qaudiodecoderbackend/tst_qaudiodecoderbackend.cpp +++ b/tests/auto/integration/qaudiodecoderbackend/tst_qaudiodecoderbackend.cpp @@ -76,6 +76,8 @@ void tst_QAudioDecoderBackend::cleanup() void tst_QAudioDecoderBackend::fileTest() { QAudioDecoder d; + if (d.error() == QAudioDecoder::ServiceMissingError) + QSKIP("There is no audio decoding support on this platform."); QAudioBuffer buffer; quint64 duration = 0; int byteCount = 0; @@ -258,6 +260,8 @@ void tst_QAudioDecoderBackend::fileTest() void tst_QAudioDecoderBackend::unsupportedFileTest() { QAudioDecoder d; + if (d.error() == QAudioDecoder::ServiceMissingError) + QSKIP("There is no audio decoding support on this platform."); QAudioBuffer buffer; QVERIFY(d.state() == QAudioDecoder::StoppedState); @@ -334,6 +338,8 @@ void tst_QAudioDecoderBackend::unsupportedFileTest() void tst_QAudioDecoderBackend::corruptedFileTest() { QAudioDecoder d; + if (d.error() == QAudioDecoder::ServiceMissingError) + QSKIP("There is no audio decoding support on this platform."); QAudioBuffer buffer; QVERIFY(d.state() == QAudioDecoder::StoppedState); @@ -406,6 +412,8 @@ void tst_QAudioDecoderBackend::corruptedFileTest() void tst_QAudioDecoderBackend::deviceTest() { QAudioDecoder d; + if (d.error() == QAudioDecoder::ServiceMissingError) + QSKIP("There is no audio decoding support on this platform."); QAudioBuffer buffer; quint64 duration = 0; int sampleCount = 0; diff --git a/tests/auto/unit/qaudiobuffer/qaudiobuffer.pro b/tests/auto/unit/qaudiobuffer/qaudiobuffer.pro index 2da74b8c7..8f8f54ac3 100644 --- a/tests/auto/unit/qaudiobuffer/qaudiobuffer.pro +++ b/tests/auto/unit/qaudiobuffer/qaudiobuffer.pro @@ -1,9 +1,3 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2012-02-02T23:40:38 -# -#------------------------------------------------- - QT += multimedia testlib QT -= gui |