diff options
| author | Justin McPherson <justin.mcpherson@nokia.com> | 2010-01-28 07:22:01 (GMT) |
|---|---|---|
| committer | Justin McPherson <justin.mcpherson@nokia.com> | 2010-01-28 07:22:01 (GMT) |
| commit | 1e7dc2be019a5cb278d5ca72702dfbac846bf3e7 (patch) | |
| tree | 99248b4cf18167b471e1bd0142f953f8d7f10268 /src | |
| parent | e3b0ec7288b2ad3c477e6717d0ce605a06c0361e (diff) | |
| download | Qt-1e7dc2be019a5cb278d5ca72702dfbac846bf3e7.zip Qt-1e7dc2be019a5cb278d5ca72702dfbac846bf3e7.tar.gz Qt-1e7dc2be019a5cb278d5ca72702dfbac846bf3e7.tar.bz2 | |
Normalise #defines for service support.
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/mediaservices/qt7/mediaplayer/mediaplayer.pri | 2 | ||||
| -rw-r--r-- | 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 |