diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-04-28 01:58:47 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-04-28 01:58:47 (GMT) |
| commit | 770c9b1568ab5cfd9d99cd1adf645da459b84da9 (patch) | |
| tree | 809ef44579e2e63f6134e31162f75c90ea02a3c9 /src/multimedia/mediaservices/base/qtmedianamespace.qdoc | |
| parent | 3b68034fc7690afc95aba8c049b94b1c6e0f4179 (diff) | |
| parent | a17339e943f21bb6c6e16884f716dd9ab8f94938 (diff) | |
| download | Qt-770c9b1568ab5cfd9d99cd1adf645da459b84da9.zip Qt-770c9b1568ab5cfd9d99cd1adf645da459b84da9.tar.gz Qt-770c9b1568ab5cfd9d99cd1adf645da459b84da9.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
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 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. |