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

8
tests/auto/qmultimedia_common/mockmetadatawritercontrol.h
View File

@@ -64,13 +64,13 @@ public:
if (m_available != available)
emit metaDataAvailableChanged(m_available = available);
}
QList<QtMultimediaKit::MetaData> availableMetaData() const { return m_data.keys(); }
QList<QtMultimedia::MetaData> availableMetaData() const { return m_data.keys(); }
bool isWritable() const { return m_writable; }
void setWritable(bool writable) { emit writableChanged(m_writable = writable); }
QVariant metaData(QtMultimediaKit::MetaData key) const { return m_data.value(key); }//Getting the metadata from Multimediakit
void setMetaData(QtMultimediaKit::MetaData key, const QVariant &value)
QVariant metaData(QtMultimedia::MetaData key) const { return m_data.value(key); }//Getting the metadata from Multimediakit
void setMetaData(QtMultimedia::MetaData key, const QVariant &value)
{
m_data.insert(key, value);
}
@@ -100,7 +100,7 @@ public:
bool m_available;
bool m_writable;
QMap<QtMultimediaKit::MetaData, QVariant> m_data;
QMap<QtMultimedia::MetaData, QVariant> m_data;
QMap<QString, QVariant> m_extendedData;
};