diff options
| author | Gareth Stockwell <ext-gareth.stockwell@nokia.com> | 2011-01-12 13:55:17 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2011-01-13 14:10:56 (GMT) |
| commit | 2ebc2d6decb86d01672f0a5afb412f7aed53c49a (patch) | |
| tree | 9cbf1f3514789bb4122ecfee6abc43427e4cba32 | |
| parent | 0041ca3ca73a617aff098ad4eaba8e9119c85824 (diff) | |
| download | Qt-2ebc2d6decb86d01672f0a5afb412f7aed53c49a.zip Qt-2ebc2d6decb86d01672f0a5afb412f7aed53c49a.tar.gz Qt-2ebc2d6decb86d01672f0a5afb412f7aed53c49a.tar.bz2 | |
Fixed build failure on platforms other than Symbian
Reviewed-by: Ruth Sadler
(cherry picked from commit 124ad6e903767fae510e0c2f0aba4029564a95c8)
| -rw-r--r-- | tests/auto/mediaobject/tst_mediaobject.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/tests/auto/mediaobject/tst_mediaobject.cpp b/tests/auto/mediaobject/tst_mediaobject.cpp index a4ee3ba..b29a6db 100644 --- a/tests/auto/mediaobject/tst_mediaobject.cpp +++ b/tests/auto/mediaobject/tst_mediaobject.cpp @@ -669,16 +669,17 @@ void tst_MediaObject::playSDP() void tst_MediaObject::playUrl_data() { QTest::addColumn<QUrl>("url"); +#ifdef Q_OS_SYMBIAN QTest::addColumn<QString>("iap"); +#endif //Q_OS_SYMBIAN QUrl rtspLink("rtsp://v1.cache8.c.youtube.com/CjgLENy73wIaLwnoDBCE7tF7fxMYESARFEIJbXYtZ29vZ2xlSARSB3Jlc3VsdHNgpbWqq7L7je5KDA==/0/0/0/video.3gp"); QUrl httpLink("http://www.theflute.co.uk/media/BachCPE_SonataAmin_1.wma"); +#ifdef Q_OS_SYMBIAN QTest::newRow("default_IAP_rtsp") << rtspLink << KDefaultIAP; QTest::newRow("invalid_IAP_rtsp") << rtspLink << KInvalidIAP; //don't test HTTP link with invalid or default IAP as it will prompt the user - -#ifdef Q_OS_SYMBIAN //Add tests with a valid IAP if we can get one from CommsDB QString validIAP; TRAPD(err, validIAP = getValidIAPL()); @@ -686,6 +687,9 @@ void tst_MediaObject::playUrl_data() QTest::newRow("valid_IAP_rtsp") << rtspLink << validIAP; QTest::newRow("valid_IAP_http") << httpLink << validIAP; } +#else + QTest::newRow("default_IAP_rtsp") << rtspLink; + QTest::newRow("invalid_IAP_rtsp") << rtspLink; #endif //Q_OS_SYMBIAN } @@ -721,7 +725,9 @@ QString tst_MediaObject::getValidIAPL() void tst_MediaObject::playUrl() { QFETCH(QUrl, url); +#ifdef Q_OS_SYMBIAN QFETCH(QString, iap); +#endif MediaObject media(this); //Create a proper media path for video and audio |