diff options
| author | Gareth Stockwell <ext-gareth.stockwell@nokia.com> | 2010-04-13 15:25:14 (GMT) |
|---|---|---|
| committer | Gareth Stockwell <ext-gareth.stockwell@nokia.com> | 2010-04-15 05:39:38 (GMT) |
| commit | 57dddfe5036e256a9d2648c85fadb5abef31fb19 (patch) | |
| tree | 34fde1f7661694b49cc6b0027d9b0bde8797414f /tests/auto | |
| parent | a484dd7cf655818aa849cf9dd002f76e137b3319 (diff) | |
| download | Qt-57dddfe5036e256a9d2648c85fadb5abef31fb19.zip Qt-57dddfe5036e256a9d2648c85fadb5abef31fb19.tar.gz Qt-57dddfe5036e256a9d2648c85fadb5abef31fb19.tar.bz2 | |
tst_mediaobject: Removed compiler warnings
Compiler warnings concerned unreachable code.
Reviewed-by: Frans Englich
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/mediaobject/qtesthelper.h | 1 | ||||
| -rw-r--r-- | tests/auto/mediaobject/tst_mediaobject.cpp | 5 |
2 files changed, 2 insertions, 4 deletions
diff --git a/tests/auto/mediaobject/qtesthelper.h b/tests/auto/mediaobject/qtesthelper.h index f082296..39d5b91 100644 --- a/tests/auto/mediaobject/qtesthelper.h +++ b/tests/auto/mediaobject/qtesthelper.h @@ -215,7 +215,6 @@ namespace QTest default: return 0; } - return 0; } } // namespace QTest QT_END_NAMESPACE diff --git a/tests/auto/mediaobject/tst_mediaobject.cpp b/tests/auto/mediaobject/tst_mediaobject.cpp index e62bfd7..efb9132 100644 --- a/tests/auto/mediaobject/tst_mediaobject.cpp +++ b/tests/auto/mediaobject/tst_mediaobject.cpp @@ -209,9 +209,7 @@ void tst_MediaObject::testPlayFromResource() { #ifdef Q_OS_SYMBIAN QSKIP("Not implemented yet.", SkipAll); - return; -#endif - +#else QFile file(MEDIA_FILEPATH); MediaObject media; media.setCurrentSource(&file); @@ -223,6 +221,7 @@ 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() |