diff options
| author | Justin McPherson <justin.mcpherson@nokia.com> | 2010-04-27 07:20:41 (GMT) |
|---|---|---|
| committer | Justin McPherson <justin.mcpherson@nokia.com> | 2010-04-27 07:20:41 (GMT) |
| commit | a193ee2dd7e28d814b8ab81287e00fdacf300369 (patch) | |
| tree | 5bff9b4f010c80c132ea355bf7691abcd2fae59c /src/multimedia | |
| parent | c9a21dbe93fc681890e37322c86020475843cf40 (diff) | |
| parent | e22b5c40225b90aa3042ed1091e8e75f576a07df (diff) | |
| download | Qt-a193ee2dd7e28d814b8ab81287e00fdacf300369.zip Qt-a193ee2dd7e28d814b8ab81287e00fdacf300369.tar.gz Qt-a193ee2dd7e28d814b8ab81287e00fdacf300369.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7
Diffstat (limited to 'src/multimedia')
| -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 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. |