diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-27 15:53:58 +0200 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-27 15:53:58 +0200 |
| commit | c78fb096c31df3b7d3cd9018f26518f59f4fde65 (patch) | |
| tree | d91b05f1bd3b242f70c662891df02910723acbc9 /src/multimedia/mediaservices/base/qtmedianamespace.qdoc | |
| parent | 62f952daa97d7a85d62f839bef2a3d015e7bb9e0 (diff) | |
| parent | a193ee2dd7e28d814b8ab81287e00fdacf300369 (diff) | |
| download | qt4-tools-c78fb096c31df3b7d3cd9018f26518f59f4fde65.tar.gz | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
MediaServices; Don't look at the debug info when looking for plugins.
Fix attempted invocation of non-existent timerActivated() slot.
Fix up qdocs for mediaservices namespace.
fix nmake build with win32-msvc2010
Added mkspec for MSVC 2010
Diffstat (limited to 'src/multimedia/mediaservices/base/qtmedianamespace.qdoc')
| -rw-r--r-- | src/multimedia/mediaservices/base/qtmedianamespace.qdoc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/multimedia/mediaservices/base/qtmedianamespace.qdoc b/src/multimedia/mediaservices/base/qtmedianamespace.qdoc index 277b1a5ae4..54b856fda2 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. |