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

2
tests/auto/qmetadatawritercontrol/qmetadatawritercontrol.pro
View File

@@ -1,6 +1,6 @@
load(qttest_p4)
QT += multimediakit-private
QT += multimedia-private
CONFIG += no_private_qt_headers_warning
SOURCES += tst_qmetadatawritercontrol.cpp

4
tests/auto/qmetadatawritercontrol/tst_qmetadatawritercontrol.cpp
View File

@@ -75,10 +75,10 @@ void tst_QMetaDataWriterControl::constructor()
mock->availableMetaData();
mock->isMetaDataAvailable();
mock->isWritable();
mock->metaData((QtMultimediaKit::MetaData) 1 );
mock->metaData((QtMultimedia::MetaData) 1 );
mock->extendedMetaData(QString("XYZ"));
mock->setExtendedMetaData(QString("XYZ"),QVariant());
mock->setMetaData((QtMultimediaKit::MetaData) 1,QVariant());
mock->setMetaData((QtMultimedia::MetaData) 1,QVariant());
((MockMetaDataWriterControl*)mock)->setWritable();
((MockMetaDataWriterControl*)mock)->setMetaDataAvailable();
delete mock;