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/qcamerawidgets/qcamerawidgets.pro
View File

@@ -1,6 +1,6 @@
load(qttest_p4)
QT += multimediakit-private multimediakitwidgets-private
QT += multimedia-private multimediawidgets-private
CONFIG += no_private_qt_headers_warning
include (../qmultimedia_common/mock.pri)

4
tests/auto/qcamerawidgets/tst_qcamerawidgets.cpp
View File

@@ -72,7 +72,7 @@
QT_USE_NAMESPACE
Q_DECLARE_METATYPE(QtMultimediaKit::MetaData)
Q_DECLARE_METATYPE(QtMultimedia::MetaData)
class tst_QCameraWidgets: public QObject
{
@@ -98,7 +98,7 @@ void tst_QCameraWidgets::initTestCase()
provider = new MockMediaServiceProvider;
mockSimpleCameraService = new MockSimpleCameraService;
provider->service = mockSimpleCameraService;
qRegisterMetaType<QtMultimediaKit::MetaData>("QtMultimediaKit::MetaData");
qRegisterMetaType<QtMultimedia::MetaData>("QtMultimedia::MetaData");
}
void tst_QCameraWidgets::cleanupTestCase()