summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authorGareth Stockwell <ext-gareth.stockwell@nokia.com>2010-07-29 08:41:39 (GMT)
committerGareth Stockwell <ext-gareth.stockwell@nokia.com>2010-08-02 09:15:07 (GMT)
commit00370b54a45cd602d04c8479538a177eb548364f (patch)
tree1082fee496dc7727a9ec5ba50b412660c8e1fe6e /tests/auto
parentfbe41c1e43d1f4fa6a8e0edda5688594801b8be3 (diff)
downloadQt-00370b54a45cd602d04c8479538a177eb548364f.zip
Qt-00370b54a45cd602d04c8479538a177eb548364f.tar.gz
Qt-00370b54a45cd602d04c8479538a177eb548364f.tar.bz2
Enabled tst_mediaobject::testPlayFromResource on Symbian
Task-number: QTBUG-6562 Reviewed-by: Justin McPherson
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/mediaobject/tst_mediaobject.cpp4
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()