summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Hartmann <Thomas.Hartmann@nokia.com>2009-04-07 12:55:04 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2009-04-08 02:16:03 (GMT)
commit9e7f2b2029c13888509ce25f1fd96e131fef28d9 (patch)
tree77783618b0a1165c043234515dfaee68dbe585f4
parent29f0bd468a6417d1334eff782d7341493acca86b (diff)
downloadQt-9e7f2b2029c13888509ce25f1fd96e131fef28d9.zip
Qt-9e7f2b2029c13888509ce25f1fd96e131fef28d9.tar.gz
Qt-9e7f2b2029c13888509ce25f1fd96e131fef28d9.tar.bz2
Fixes: mediaobject autotest for windows ce (waveout)
RevBy: Joerg AutoTest: mediaobject Details: Since our wave files on Windows CE are very short (memory) we actually land up in the PausedState when playback is finished (cherry picked from commit 0ea43e7d28815c133e8029f3d966871a10fef8e0)
-rw-r--r--tests/auto/mediaobject/tst_mediaobject.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/mediaobject/tst_mediaobject.cpp b/tests/auto/mediaobject/tst_mediaobject.cpp
index 96589b7..e0275de 100644
--- a/tests/auto/mediaobject/tst_mediaobject.cpp
+++ b/tests/auto/mediaobject/tst_mediaobject.cpp
@@ -787,7 +787,7 @@ void tst_MediaObject::setMediaAndPlay()
QSignalSpy totalTimeChangedSignalSpy(m_media, SIGNAL(totalTimeChanged(qint64)));
QVERIFY(m_media->currentSource().type() != MediaSource::Invalid);
Phonon::State state = m_media->state();
- QVERIFY(state == Phonon::StoppedState || state == Phonon::PlayingState);
+ QVERIFY(state == Phonon::StoppedState || state == Phonon::PlayingState || Phonon::PausedState);
m_media->setCurrentSource(m_url);
// before calling play() we better make sure that if play() finishes very fast that we don't get
// called again