diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2010-02-22 13:58:27 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar@trolltech.com> | 2010-02-22 13:58:27 (GMT) |
| commit | 22efbe7d4388787d3a9f2511cbf780d4ccc17c2f (patch) | |
| tree | 01f4522e86aa874eb3072237fe02cd2213ccae3d /src/multimedia/base/qtmedianamespace.qdoc | |
| parent | 28cbbf0ce72b33a259f097a070571589e49f8923 (diff) | |
| parent | 66fb4038649cfd1d660204bf7c70f99a409ede4f (diff) | |
| download | Qt-22efbe7d4388787d3a9f2511cbf780d4ccc17c2f.zip Qt-22efbe7d4388787d3a9f2511cbf780d4ccc17c2f.tar.gz Qt-22efbe7d4388787d3a9f2511cbf780d4ccc17c2f.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2
Diffstat (limited to 'src/multimedia/base/qtmedianamespace.qdoc')
| -rw-r--r-- | src/multimedia/base/qtmedianamespace.qdoc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/multimedia/base/qtmedianamespace.qdoc b/src/multimedia/base/qtmedianamespace.qdoc index 0fb39f5..270c7d6 100644 --- a/src/multimedia/base/qtmedianamespace.qdoc +++ b/src/multimedia/base/qtmedianamespace.qdoc @@ -40,15 +40,15 @@ ****************************************************************************/ /*! - \namespace QtMedia + \namespace QtMultimedia \ingroup multimedia - \brief The QtMedia namespace contains miscellaneous identifiers used throughout the Qt Media - library. + \brief The QtMultimedia namespace contains miscellaneous identifiers used + throughout the Qt Multimedia library. */ /*! - \enum QtMedia::MetaData + \enum QtMultimedia::MetaData This enum provides identifiers for meta-data attributes. @@ -165,7 +165,7 @@ */ /*! - \enum QtMedia::SupportEstimate + \enum QtMultimedia::SupportEstimate Enumerates the levels of support a media service provider may have for a feature. @@ -176,7 +176,7 @@ */ /*! - \enum QtMedia::EncodingQuality + \enum QtMultimedia::EncodingQuality Enumerates quality encoding levels. @@ -188,7 +188,7 @@ */ /*! - \enum QtMedia::EncodingMode + \enum QtMultimedia::EncodingMode Enumerates encoding modes. @@ -199,7 +199,7 @@ */ /*! - \enum QtMedia::AvailabilityError + \enum QtMultimedia::AvailabilityError Enumerates Service status errors. |