diff options
Diffstat (limited to 'src/multimedia/mediaservices')
-rw-r--r-- | src/multimedia/mediaservices/base/qmediapluginloader.cpp | 6 | ||||
-rw-r--r-- | src/multimedia/mediaservices/base/qtmedianamespace.qdoc | 18 |
2 files changed, 14 insertions, 10 deletions
diff --git a/src/multimedia/mediaservices/base/qmediapluginloader.cpp b/src/multimedia/mediaservices/base/qmediapluginloader.cpp index d6da0ba..8b0ddf4 100644 --- a/src/multimedia/mediaservices/base/qmediapluginloader.cpp +++ b/src/multimedia/mediaservices/base/qmediapluginloader.cpp @@ -108,7 +108,11 @@ void QMediaPluginLoader::load() if (!pluginDir.exists()) continue; - foreach (QString pluginLib, pluginDir.entryList(QDir::Files)) { + foreach (const QString &pluginLib, pluginDir.entryList(QDir::Files)) { +#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) + if (pluginLib.endsWith(QLatin1String(".debug"))) + continue; +#endif QPluginLoader loader(pluginPathName + pluginLib); QObject *o = loader.instance(); diff --git a/src/multimedia/mediaservices/base/qtmedianamespace.qdoc b/src/multimedia/mediaservices/base/qtmedianamespace.qdoc index 277b1a5..54b856f 100644 --- a/src/multimedia/mediaservices/base/qtmedianamespace.qdoc +++ b/src/multimedia/mediaservices/base/qtmedianamespace.qdoc @@ -40,15 +40,15 @@ ****************************************************************************/ /*! - \namespace QtMultimedia - \ingroup multimedia + \namespace QtMediaServices + \ingroup multimedia-serv - \brief The QtMultimedia namespace contains miscellaneous identifiers used - throughout the Qt Multimedia library. + \brief The QtMediaServices namespace contains miscellaneous identifiers used + throughout the Qt Media Services library. */ /*! - \enum QtMultimedia::MetaData + \enum QtMediaServices::MetaData This enum provides identifiers for meta-data attributes. @@ -169,7 +169,7 @@ */ /*! - \enum QtMultimedia::SupportEstimate + \enum QtMediaServices::SupportEstimate Enumerates the levels of support a media service provider may have for a feature. @@ -180,7 +180,7 @@ */ /*! - \enum QtMultimedia::EncodingQuality + \enum QtMediaServices::EncodingQuality Enumerates quality encoding levels. @@ -192,7 +192,7 @@ */ /*! - \enum QtMultimedia::EncodingMode + \enum QtMediaServices::EncodingMode Enumerates encoding modes. @@ -203,7 +203,7 @@ */ /*! - \enum QtMultimedia::AvailabilityError + \enum QtMediaServices::AvailabilityError Enumerates Service status errors. |