summaryrefslogtreecommitdiffstats
path: root/tests/auto/mediaobject
diff options
context:
space:
mode:
authorGareth Stockwell <ext-gareth.stockwell@nokia.com>2011-01-12 13:55:17 (GMT)
committerGareth Stockwell <ext-gareth.stockwell@nokia.com>2011-01-12 14:03:26 (GMT)
commit124ad6e903767fae510e0c2f0aba4029564a95c8 (patch)
treef8bfa7dc62045086824e8e31d771e4368ea0a3e7 /tests/auto/mediaobject
parentff5a772b77cd52099ce7000a348d21e7c2fe3f2e (diff)
downloadQt-124ad6e903767fae510e0c2f0aba4029564a95c8.zip
Qt-124ad6e903767fae510e0c2f0aba4029564a95c8.tar.gz
Qt-124ad6e903767fae510e0c2f0aba4029564a95c8.tar.bz2
Fixed build failure on platforms other than Symbian
Reviewed-by: Ruth Sadler
Diffstat (limited to 'tests/auto/mediaobject')
-rw-r--r--tests/auto/mediaobject/tst_mediaobject.cpp10
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