diff -r e4ebb16b39ea -r 603d3f8b6302 plugins/multimedia/qt7/qt7serviceplugin.mm --- a/plugins/multimedia/qt7/qt7serviceplugin.mm Fri Sep 17 08:34:34 2010 +0300 +++ b/plugins/multimedia/qt7/qt7serviceplugin.mm Mon Oct 04 01:37:06 2010 +0300 @@ -51,7 +51,11 @@ QStringList QT7ServicePlugin::keys() const { - return QStringList() << QLatin1String(Q_MEDIASERVICE_MEDIAPLAYER); + return QStringList() +#ifdef QMEDIA_QT7_PLAYER + << QLatin1String(Q_MEDIASERVICE_MEDIAPLAYER) +#endif + ; } QMediaService* QT7ServicePlugin::create(QString const& key) @@ -59,9 +63,10 @@ #ifdef QT_DEBUG_QT7 qDebug() << "QT7ServicePlugin::create" << key; #endif +#ifdef QMEDIA_QT7_PLAYER if (key == QLatin1String(Q_MEDIASERVICE_MEDIAPLAYER)) return new QT7PlayerService; - +#endif qWarning() << "unsupported key:" << key; return 0;