summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin McPherson <justin.mcpherson@nokia.com>2010-02-17 05:56:37 (GMT)
committerJustin McPherson <justin.mcpherson@nokia.com>2010-02-17 05:56:37 (GMT)
commite1dfd11e73095bcdea7265afa3595b1c8a9e5502 (patch)
treed0c02a33c1e59998fee9191770e1919e67cf6209
parent401ee4c7b14146b39419dafe1981c6a8a108196e (diff)
downloadQt-e1dfd11e73095bcdea7265afa3595b1c8a9e5502.zip
Qt-e1dfd11e73095bcdea7265afa3595b1c8a9e5502.tar.gz
Qt-e1dfd11e73095bcdea7265afa3595b1c8a9e5502.tar.bz2
Fix QMediaServiceProvider test.
-rw-r--r--tests/auto/qmediaserviceprovider/tst_qmediaserviceprovider.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/auto/qmediaserviceprovider/tst_qmediaserviceprovider.cpp b/tests/auto/qmediaserviceprovider/tst_qmediaserviceprovider.cpp
index 671cfa4..9409394 100644
--- a/tests/auto/qmediaserviceprovider/tst_qmediaserviceprovider.cpp
+++ b/tests/auto/qmediaserviceprovider/tst_qmediaserviceprovider.cpp
@@ -107,6 +107,7 @@ public:
QList<QByteArray> devices(const QByteArray &service) const
{
+ Q_UNUSED(service);
QList<QByteArray> res;
return res;
}
@@ -198,6 +199,7 @@ public:
QList<QByteArray> devices(const QByteArray &service) const
{
+ Q_UNUSED(service);
QList<QByteArray> res;
return res;
}
@@ -252,7 +254,7 @@ void tst_QMediaServiceProvider::initTestCase()
plugins << new MockServicePlugin2;
plugins << new MockServicePlugin3;
- QMediaPluginLoader::setStaticPlugins(QLatin1String("/mediaservice"), plugins);
+ QMediaPluginLoader::setStaticPlugins(QLatin1String("/mediaservices"), plugins);
}
void tst_QMediaServiceProvider::testDefaultProviderAvailable()
@@ -270,7 +272,6 @@ void tst_QMediaServiceProvider::testObtainService()
QMediaService *service = 0;
- QTest::ignoreMessage(QtWarningMsg, "Load static plugins for \"/mediaservice/\" ");
// Player
service = provider->requestService(Q_MEDIASERVICE_MEDIAPLAYER);
QVERIFY(service != 0);