slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename QtMultimediaKit to QtMultimedia.

Browse Source 
There are a few legacy bits left in place so it passes CI, and
then qt5.git etc can be updated.

Change-Id: I6b082e50e6958c72fdabc2974992e16d90dafa3a
Reviewed-on: http://codereview.qt-project.org/5368
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
This commit is contained in:
Michael Goddard
2011-10-06 14:31:58 +10:00
committed by Qt by Nokia
parent 55bc4f2b46
commit 03f22bcdaf
395 changed files with 1393 additions and 3088 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/wmf/player/mfmetadatacontrol.h
View File

@@ -56,8 +56,8 @@ public:
bool isMetaDataAvailable() const;
QVariant metaData(QtMultimediaKit::MetaData key) const;
QList<QtMultimediaKit::MetaData> availableMetaData() const;
QVariant metaData(QtMultimedia::MetaData key) const;
QList<QtMultimedia::MetaData> availableMetaData() const;
QVariant extendedMetaData(const QString &key) const;
QStringList availableExtendedMetaData() const;
@@ -69,7 +69,7 @@ private:
IPropertyStore *m_content; //for Windows7
IMFMetadata *m_metaData; //for Vista
QList<QtMultimediaKit::MetaData> m_availableMetaDatas;
QList<QtMultimedia::MetaData> m_availableMetaDatas;
QList<PROPERTYKEY> m_commonKeys; //for Windows7
QStringList m_commonNames; //for Vista