diff options
| author | Joerg Bornemann <joerg.bornemann@nokia.com> | 2010-02-26 15:19:54 (GMT) |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@nokia.com> | 2010-02-26 15:19:54 (GMT) |
| commit | ed1d9f24d035857438e5bb9ccb423310bc30310b (patch) | |
| tree | ef949d57470b11331a6a2b667f2cdb5467c285cd /src/multimedia/base/qmetadatacontrol.cpp | |
| parent | ab9a87eb2a5af0b74834e247f44fb4fad0dfb8cb (diff) | |
| parent | 27e403d9c6185c606980bb7881e39a2c88138a13 (diff) | |
| download | Qt-ed1d9f24d035857438e5bb9ccb423310bc30310b.zip Qt-ed1d9f24d035857438e5bb9ccb423310bc30310b.tar.gz Qt-ed1d9f24d035857438e5bb9ccb423310bc30310b.tar.bz2 | |
Merge remote branch 'origin/master' into berlin-master
Conflicts:
configure.exe
Diffstat (limited to 'src/multimedia/base/qmetadatacontrol.cpp')
| -rw-r--r-- | src/multimedia/base/qmetadatacontrol.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/multimedia/base/qmetadatacontrol.cpp b/src/multimedia/base/qmetadatacontrol.cpp index 3ecbe8d..28a82ec 100644 --- a/src/multimedia/base/qmetadatacontrol.cpp +++ b/src/multimedia/base/qmetadatacontrol.cpp @@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE /*! \class QMetaDataControl \ingroup multimedia-serv - + \since 4.7 \preliminary \brief The QMetaDataControl class provides access to the meta-data of a QMediaService's media. |