From 1e7dc2be019a5cb278d5ca72702dfbac846bf3e7 Mon Sep 17 00:00:00 2001
From: Justin McPherson <justin.mcpherson@nokia.com>
Date: Thu, 28 Jan 2010 17:22:01 +1000
Subject: Normalise #defines for service support.

---
 src/plugins/mediaservices/qt7/mediaplayer/mediaplayer.pri | 2 +-
 src/plugins/mediaservices/qt7/qt7serviceplugin.mm         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/plugins/mediaservices/qt7/mediaplayer/mediaplayer.pri b/src/plugins/mediaservices/qt7/mediaplayer/mediaplayer.pri
index f00d418..577209e 100644
--- a/src/plugins/mediaservices/qt7/mediaplayer/mediaplayer.pri
+++ b/src/plugins/mediaservices/qt7/mediaplayer/mediaplayer.pri
@@ -1,6 +1,6 @@
 INCLUDEPATH += $$PWD
 
-DEFINES += Q_MEDIASERVICE_MEDIAPLAYER_AVAILABLE
+DEFINES += QMEDIA_QT7_PLAYER
 
 HEADERS += \
     $$PWD/qt7playercontrol.h \
diff --git a/src/plugins/mediaservices/qt7/qt7serviceplugin.mm b/src/plugins/mediaservices/qt7/qt7serviceplugin.mm
index 3e2a2a6..c59a453 100644
--- a/src/plugins/mediaservices/qt7/qt7serviceplugin.mm
+++ b/src/plugins/mediaservices/qt7/qt7serviceplugin.mm
@@ -52,14 +52,14 @@ QT_BEGIN_NAMESPACE
 QStringList QT7ServicePlugin::keys() const
 {
     return QStringList()
-#ifdef Q_MEDIASERVICE_MEDIAPLAYER_AVAILABLE
+#ifdef QMEDIA_QT7_PLAYER
     << QLatin1String(Q_MEDIASERVICE_MEDIAPLAYER);
 #endif
 }
 
 QMediaService* QT7ServicePlugin::create(QString const& key)
 {
-#ifdef Q_MEDIASERVICE_MEDIAPLAYER_AVAILABLE
+#ifdef QMEDIA_QT7_PLAYER
     if (key == QLatin1String(Q_MEDIASERVICE_MEDIAPLAYER))
         return new QT7PlayerService;
 #endif
-- 
cgit v0.12