Merge remote-tracking branch 'origin/5.7' into dev

Change-Id: I773db005bbdc511169917ee35eb5b517e898926b

4 files changed, 15 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 b60bdbc07..2af06b46c 100644
--- a/tests/auto/integration/qaudiodecoderbackend/tst_qaudiodecoderbackend.cpp
+++ b/tests/auto/integration/qaudiodecoderbackend/tst_qaudiodecoderbackend.cpp
@@ -64,6 +64,9 @@ void tst_QAudioDecoderBackend::init()
 
 void tst_QAudioDecoderBackend::initTestCase()
 {
+    QAudioDecoder d;
+    if (!d.isAvailable())
+        QSKIP("Audio decoder service is not available");
 }
 
 void tst_QAudioDecoderBackend::cleanup()
@@ -73,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;
@@ -255,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);
@@ -331,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);
@@ -403,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/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp b/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp
index 35d281cd7..dfa1bf254 100644
--- a/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp
+++ b/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp
@@ -198,6 +198,10 @@ QMediaContent tst_QMediaPlayerBackend::selectMediaFile(const QStringList& mediaC
 
 void tst_QMediaPlayerBackend::initTestCase()
 {
+    QMediaPlayer player;
+    if (!player.isAvailable())
+        QSKIP("Media player service is not available");
+
     const QString testFileName = QFINDTESTDATA("testdata/test.wav");
     QFileInfo wavFile(testFileName);
 
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