diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-02 14:20:45 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-02 14:20:45 (GMT) |
| commit | b26bdb1ee896af0dd0dfc0ec3fbb6714504c3d8d (patch) | |
| tree | f4640778e9a35cc41137f2712776e0e30432488a /tests | |
| parent | e393c706e1e8d9004ac3dc855b6e33327523a137 (diff) | |
| parent | 700ba679e88241ce35b16c46326a854c07ac9b8a (diff) | |
| download | Qt-b26bdb1ee896af0dd0dfc0ec3fbb6714504c3d8d.zip Qt-b26bdb1ee896af0dd0dfc0ec3fbb6714504c3d8d.tar.gz Qt-b26bdb1ee896af0dd0dfc0ec3fbb6714504c3d8d.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fixed build break on Symbian versions earlier than S^3
Fixed qsymbianbearer.qtplugin exports in s60installs.pro
Enabled tst_mediaobject::testPlayFromResource on Symbian
Added support to Phonon MMF backend for playback of Qt resource files
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/mediaobject/tst_mediaobject.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/tests/auto/mediaobject/tst_mediaobject.cpp b/tests/auto/mediaobject/tst_mediaobject.cpp index 2f98521..322e2e4 100644 --- a/tests/auto/mediaobject/tst_mediaobject.cpp +++ b/tests/auto/mediaobject/tst_mediaobject.cpp @@ -201,9 +201,6 @@ void tst_MediaObject::stateChanged(Phonon::State newstate, Phonon::State oldstat void tst_MediaObject::testPlayFromResource() { -#ifdef Q_OS_SYMBIAN - QSKIP("Not implemented yet.", SkipAll); -#else MediaObject media; media.setCurrentSource(QString(MEDIA_FILEPATH)); QVERIFY(media.state() != Phonon::ErrorState); @@ -214,7 +211,6 @@ void tst_MediaObject::testPlayFromResource() if (media.state() != Phonon::PlayingState) QTest::waitForSignal(&media, SIGNAL(stateChanged(Phonon::State, Phonon::State)), 10000); QCOMPARE(media.state(), Phonon::PlayingState); -#endif } void tst_MediaObject::testPlayIllegalFile() |