From e1dfd11e73095bcdea7265afa3595b1c8a9e5502 Mon Sep 17 00:00:00 2001
From: Justin McPherson <justin.mcpherson@nokia.com>
Date: Wed, 17 Feb 2010 15:56:37 +1000
Subject: Fix QMediaServiceProvider test.

---
 tests/auto/qmediaserviceprovider/tst_qmediaserviceprovider.cpp | 5 +++--
 1 file 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);
-- 
cgit v0.12