summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYoann Lopes <yoann.lopes@theqtcompany.com>2015-11-01 17:29:23 +0100
committerYoann Lopes <yoann.lopes@theqtcompany.com>2016-01-06 15:20:57 +0000
commit704ac34cc79e3711880bae8eba9c926080b97131 (patch)
tree99c0c3b641686e1ad930d51b90a33b1276cbc8ed
parente8a75e225b2a710362dcfb04de8cc99849fa6f30 (diff)
downloadqtmultimedia-704ac34cc79e3711880bae8eba9c926080b97131.tar.gz
Favor more commonly supported formats in qmediaplayerbackend test.
Prefer mp4 and mp3 over ogv and mkv. Change-Id: Id24d475207ccf76e113557f9ad14775477f414aa Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
-rw-r--r--tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp b/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp
index eafc3d188..c032734c5 100644
--- a/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp
+++ b/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp
@@ -220,13 +220,13 @@ void tst_QMediaPlayerBackend::initTestCase()
qRegisterMetaType<QMediaContent>();
QStringList mediaCandidates;
- mediaCandidates << QFINDTESTDATA("testdata/colors.ogv");
mediaCandidates << QFINDTESTDATA("testdata/colors.mp4");
+ mediaCandidates << QFINDTESTDATA("testdata/colors.ogv");
localVideoFile = selectMediaFile(mediaCandidates);
mediaCandidates.clear();
- mediaCandidates << QFINDTESTDATA("testdata/nokia-tune.mkv");
mediaCandidates << QFINDTESTDATA("testdata/nokia-tune.mp3");
+ mediaCandidates << QFINDTESTDATA("testdata/nokia-tune.mkv");
localCompressedSoundFile = selectMediaFile(mediaCandidates);
localFileWithMetadata = selectMediaFile(QStringList() << QFINDTESTDATA("testdata/nokia-tune.mp3"));