diff options
author | Jens Bache-Wiig <jbache@trolltech.com> | 2010-07-07 13:38:22 (GMT) |
---|---|---|
committer | Jens Bache-Wiig <jbache@trolltech.com> | 2010-07-07 13:41:00 (GMT) |
commit | 495dfda1bea31017d08a435dcb61b43b4df81d24 (patch) | |
tree | 41fb07da9b02ae52e41ad1fd8da8edfa657ab8dd /tests/auto/mediaobject | |
parent | 6f6ec0ee680c7d4b5cf70116e756cca90668fd90 (diff) | |
download | Qt-495dfda1bea31017d08a435dcb61b43b4df81d24.zip Qt-495dfda1bea31017d08a435dcb61b43b4df81d24.tar.gz Qt-495dfda1bea31017d08a435dcb61b43b4df81d24.tar.bz2 |
Phonon MediaSource fails to load when passed as a resource file
Files fail to load when passing resoure path to mediasource.
The original regression seems to be caused by a behavior change
as reported here: http://bugreports.qt.nokia.com/browse/QTBUG-12015
Note a merge request is also pending on Gitorious
http://gitorious.org/phonon/phonon/merge_requests/17
Task-number: QTBUG-9323
Reviewed-by: thierry
Diffstat (limited to 'tests/auto/mediaobject')
-rw-r--r-- | tests/auto/mediaobject/tst_mediaobject.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/auto/mediaobject/tst_mediaobject.cpp b/tests/auto/mediaobject/tst_mediaobject.cpp index 994057b..2f98521 100644 --- a/tests/auto/mediaobject/tst_mediaobject.cpp +++ b/tests/auto/mediaobject/tst_mediaobject.cpp @@ -204,9 +204,8 @@ void tst_MediaObject::testPlayFromResource() #ifdef Q_OS_SYMBIAN QSKIP("Not implemented yet.", SkipAll); #else - QFile file(MEDIA_FILEPATH); MediaObject media; - media.setCurrentSource(&file); + media.setCurrentSource(QString(MEDIA_FILEPATH)); QVERIFY(media.state() != Phonon::ErrorState); if (media.state() != Phonon::StoppedState) QTest::waitForSignal(&media, SIGNAL(stateChanged(Phonon::State, Phonon::State)), 10000); |