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

@@ -1,7 +1,7 @@
TEMPLATE = subdirs
SUBDIRS += multimedia.pro
contains(QT_CONFIG,multimediakitwidgets): SUBDIRS += multimediawidgets.pro
contains(QT_CONFIG,multimediawidgets): SUBDIRS += multimediawidgets.pro
# These autotests consist of things such as static code checks
# which require that the autotest is run on the same machine

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

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

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

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

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

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

4
tests/auto/qaudiocapturesource/tst_qaudiocapturesource.cpp
View File

@@ -167,14 +167,14 @@ void tst_QAudioCaptureSource::testAvailability()
QAudioCaptureSource source(0, &provider);
QVERIFY(source.isAvailable() == false);
QVERIFY(source.availabilityError() == QtMultimediaKit::ServiceMissingError);
QVERIFY(source.availabilityError() == QtMultimedia::ServiceMissingError);
service.hasControls = true;
MockMediaServiceProvider provider2(&service);
QAudioCaptureSource source2(0, &provider2);
QVERIFY(source2.isAvailable() == true);
QVERIFY(source2.availabilityError() == QtMultimediaKit::NoError);
QVERIFY(source2.availabilityError() == QtMultimedia::NoError);
}
void tst_QAudioCaptureSource::testAvailableAudioInputChangedSignal()

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

@@ -1,6 +1,6 @@
load(qttest_p4)
QT += core multimediakit-private
QT += core multimedia-private
CONFIG += no_private_qt_headers_warning
# This is more of a system test

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

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

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

@@ -1,6 +1,6 @@
load(qttest_p4)
QT += core multimediakit-private
QT += core multimedia-private
CONFIG += no_private_qt_headers_warning
# This is more of a system test

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

@@ -1,6 +1,6 @@
load(qttest_p4)
QT += core multimediakit-private
QT += core multimedia-private
CONFIG += no_private_qt_headers_warning
# This is more of a system test

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

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

32
tests/auto/qcamera/tst_qcamera.cpp
View File

@@ -69,7 +69,7 @@
QT_USE_NAMESPACE
Q_DECLARE_METATYPE(QtMultimediaKit::MetaData)
Q_DECLARE_METATYPE(QtMultimedia::MetaData)
class tst_QCamera: public QObject
{
@@ -175,7 +175,7 @@ void tst_QCamera::initTestCase()
provider = new MockMediaServiceProvider;
mockSimpleCameraService = new MockSimpleCameraService;
provider->service = mockSimpleCameraService;
qRegisterMetaType<QtMultimediaKit::MetaData>("QtMultimediaKit::MetaData");
qRegisterMetaType<QtMultimedia::MetaData>("QtMultimedia::MetaData");
}
void tst_QCamera::cleanupTestCase()
@@ -515,7 +515,7 @@ void tst_QCamera::testCameraCaptureMetadata()
QCamera camera(0, provider);
QCameraImageCapture imageCapture(&camera);
QSignalSpy metadataSignal(&imageCapture, SIGNAL(imageMetadataAvailable(int,QtMultimediaKit::MetaData,QVariant)));
QSignalSpy metadataSignal(&imageCapture, SIGNAL(imageMetadataAvailable(int,QtMultimedia::MetaData,QVariant)));
QSignalSpy extendedMetadataSignal(&imageCapture, SIGNAL(imageMetadataAvailable(int,QString,QVariant)));
QSignalSpy savedSignal(&imageCapture, SIGNAL(imageSaved(int,QString)));
@@ -531,12 +531,12 @@ void tst_QCamera::testCameraCaptureMetadata()
QVariantList metadata = metadataSignal[0];
QCOMPARE(metadata[0].toInt(), id);
QCOMPARE(metadata[1].value<QtMultimediaKit::MetaData>(), QtMultimediaKit::FocalLengthIn35mmFilm);
QCOMPARE(metadata[1].value<QtMultimedia::MetaData>(), QtMultimedia::FocalLengthIn35mmFilm);
QCOMPARE(metadata[2].value<QVariant>().toInt(), 50);
metadata = metadataSignal[1];
QCOMPARE(metadata[0].toInt(), id);
QCOMPARE(metadata[1].value<QtMultimediaKit::MetaData>(), QtMultimediaKit::DateTimeOriginal);
QCOMPARE(metadata[1].value<QtMultimedia::MetaData>(), QtMultimedia::DateTimeOriginal);
QDateTime captureTime = metadata[2].value<QVariant>().value<QDateTime>();
QVERIFY(qAbs(captureTime.secsTo(QDateTime::currentDateTime()) < 5)); //it should not takes more than 5 seconds for signal to arrive here
@@ -785,9 +785,9 @@ void tst_QCamera::testImageSettings()
QVERIFY(settings != QImageEncoderSettings());
settings = QImageEncoderSettings();
QCOMPARE(settings.quality(), QtMultimediaKit::NormalQuality);
settings.setQuality(QtMultimediaKit::HighQuality);
QCOMPARE(settings.quality(), QtMultimediaKit::HighQuality);
QCOMPARE(settings.quality(), QtMultimedia::NormalQuality);
settings.setQuality(QtMultimedia::HighQuality);
QCOMPARE(settings.quality(), QtMultimedia::HighQuality);
QVERIFY(!settings.isNull());
settings = QImageEncoderSettings();
@@ -801,7 +801,7 @@ void tst_QCamera::testImageSettings()
settings = QImageEncoderSettings();
QVERIFY(settings.isNull());
QCOMPARE(settings.codec(), QString());
QCOMPARE(settings.quality(), QtMultimediaKit::NormalQuality);
QCOMPARE(settings.quality(), QtMultimedia::NormalQuality);
QCOMPARE(settings.resolution(), QSize());
{
@@ -813,7 +813,7 @@ void tst_QCamera::testImageSettings()
QCOMPARE(settings2, settings1);
QVERIFY(settings2.isNull());
settings1.setQuality(QtMultimediaKit::HighQuality);
settings1.setQuality(QtMultimedia::HighQuality);
QVERIFY(settings2.isNull());
QVERIFY(!settings1.isNull());
@@ -829,7 +829,7 @@ void tst_QCamera::testImageSettings()
QCOMPARE(settings2, settings1);
QVERIFY(settings2.isNull());
settings1.setQuality(QtMultimediaKit::HighQuality);
settings1.setQuality(QtMultimedia::HighQuality);
QVERIFY(settings2.isNull());
QVERIFY(!settings1.isNull());
@@ -856,11 +856,11 @@ void tst_QCamera::testImageSettings()
QVERIFY(settings1 != settings2);
settings1 = QImageEncoderSettings();
settings1.setQuality(QtMultimediaKit::NormalQuality);
settings1.setQuality(QtMultimedia::NormalQuality);
settings2 = QImageEncoderSettings();
settings2.setQuality(QtMultimediaKit::NormalQuality);
settings2.setQuality(QtMultimedia::NormalQuality);
QVERIFY(settings1 == settings2);
settings2.setQuality(QtMultimediaKit::LowQuality);
settings2.setQuality(QtMultimedia::LowQuality);
QVERIFY(settings1 != settings2);
}
@@ -1246,10 +1246,10 @@ void tst_QCamera::testAvailabilityError()
MockCameraService service;
provider->service = &service;
QCamera camera(0, provider);
QVERIFY(camera.availabilityError() == QtMultimediaKit::NoError);
QVERIFY(camera.availabilityError() == QtMultimedia::NoError);
QCamera *camera1 = new QCamera("random");
QVERIFY(camera1->availabilityError() == QtMultimediaKit::ServiceMissingError);
QVERIFY(camera1->availabilityError() == QtMultimedia::ServiceMissingError);
delete camera1;
}

2
tests/auto/qcamerabackend/qcamerabackend.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
# This is more of a system test

6
tests/auto/qcamerabackend/tst_qcamerabackend.cpp
View File

@@ -121,7 +121,7 @@ QT_USE_NAMESPACE
*/
Q_DECLARE_METATYPE(QtMultimediaKit::MetaData)
Q_DECLARE_METATYPE(QtMultimedia::MetaData)
Q_DECLARE_METATYPE(QVideoFrame)
class tst_QCameraBackend: public QObject
@@ -149,7 +149,7 @@ private:
void tst_QCameraBackend::initTestCase()
{
qRegisterMetaType<QtMultimediaKit::MetaData>("QtMultimediaKit::MetaData");
qRegisterMetaType<QtMultimedia::MetaData>("QtMultimedia::MetaData");
QCamera camera;
if (!camera.isAvailable())
@@ -523,7 +523,7 @@ void tst_QCameraBackend::testCameraCaptureMetadata()
QCameraImageCapture imageCapture(&camera);
camera.exposure()->setFlashMode(QCameraExposure::FlashOff);
QSignalSpy metadataSignal(&imageCapture, SIGNAL(imageMetadataAvailable(int,QtMultimediaKit::MetaData,QVariant)));
QSignalSpy metadataSignal(&imageCapture, SIGNAL(imageMetadataAvailable(int,QtMultimedia::MetaData,QVariant)));
QSignalSpy savedSignal(&imageCapture, SIGNAL(imageSaved(int,QString)));
camera.start();

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

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

10
tests/auto/qcameraimagecapture/tst_qcameraimagecapture.cpp
View File

@@ -254,11 +254,11 @@ void tst_QCameraImageCapture::encodingSettings()
QVERIFY(imageCapture.encodingSettings() == QImageEncoderSettings());
QImageEncoderSettings settings;
settings.setCodec("JPEG");
settings.setQuality(QtMultimediaKit::NormalQuality);
settings.setQuality(QtMultimedia::NormalQuality);
imageCapture.setEncodingSettings(settings);
QVERIFY(!imageCapture.encodingSettings().isNull());
QVERIFY(imageCapture.encodingSettings().codec() == "JPEG");
QVERIFY(imageCapture.encodingSettings().quality() == QtMultimediaKit::NormalQuality);
QVERIFY(imageCapture.encodingSettings().quality() == QtMultimedia::NormalQuality);
}
//MaemoAPI-1838:test supportedImageCodecs
@@ -307,7 +307,7 @@ void tst_QCameraImageCapture::errors()
imageCapture1.capture(QString::fromLatin1("/dev/null"));
QVERIFY(imageCapture1.error() == QCameraImageCapture::NotSupportedFeatureError);
QVERIFY2(!imageCapture1.errorString().isEmpty(), "Device does not support images capture");
QVERIFY(imageCapture1.availabilityError() == QtMultimediaKit::ServiceMissingError);
QVERIFY(imageCapture1.availabilityError() == QtMultimedia::ServiceMissingError);
QCamera camera(0, provider);
@@ -315,12 +315,12 @@ void tst_QCameraImageCapture::errors()
QVERIFY(imageCapture.isAvailable() == true);
QVERIFY(imageCapture.error() == QCameraImageCapture::NoError);
QVERIFY(imageCapture.errorString().isEmpty());
QVERIFY(imageCapture.availabilityError() == QtMultimediaKit::NoError);
QVERIFY(imageCapture.availabilityError() == QtMultimedia::NoError);
imageCapture.capture();
QVERIFY(imageCapture.error() == QCameraImageCapture::NotReadyError);
QVERIFY2(!imageCapture.errorString().isEmpty(), "Could not capture in stopped state");
QVERIFY(imageCapture.availabilityError() == QtMultimediaKit::NoError);
QVERIFY(imageCapture.availabilityError() == QtMultimedia::NoError);
}
//MaemoAPI-1831:test error

2
tests/auto/qcameraviewfinder/qcameraviewfinder.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)

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()

14
tests/auto/qdeclarativeaudio/qdeclarativeaudio.pro
View File

@@ -1,16 +1,16 @@
load(qttest_p4)
QT += multimediakit-private declarative
QT += multimedia-private declarative
CONFIG += no_private_qt_headers_warning
HEADERS += \
$$QT.multimediakit.sources/../imports/multimedia/qdeclarativeaudio_p.h \
$$QT.multimediakit.sources/../imports/multimedia/qdeclarativemediabase_p.h \
$$QT.multimediakit.sources/../imports/multimedia/qdeclarativemediametadata_p.h
$$QT.multimedia.sources/../imports/multimedia/qdeclarativeaudio_p.h \
$$QT.multimedia.sources/../imports/multimedia/qdeclarativemediabase_p.h \
$$QT.multimedia.sources/../imports/multimedia/qdeclarativemediametadata_p.h
SOURCES += \
tst_qdeclarativeaudio.cpp \
$$QT.multimediakit.sources/../imports/multimedia/qdeclarativeaudio.cpp \
$$QT.multimediakit.sources/../imports/multimedia/qdeclarativemediabase.cpp
$$QT.multimedia.sources/../imports/multimedia/qdeclarativeaudio.cpp \
$$QT.multimedia.sources/../imports/multimedia/qdeclarativemediabase.cpp
INCLUDEPATH += $$QT.multimediakit.sources/../imports/multimedia
INCLUDEPATH += $$QT.multimedia.sources/../imports/multimedia

20
tests/auto/qdeclarativeaudio/tst_qdeclarativeaudio.cpp
View File

@@ -82,7 +82,7 @@ private slots:
void loops();
};
Q_DECLARE_METATYPE(QtMultimediaKit::MetaData);
Q_DECLARE_METATYPE(QtMultimedia::MetaData);
Q_DECLARE_METATYPE(QDeclarativeAudio::Error);
class QtTestMediaPlayerControl : public QMediaPlayerControl
@@ -203,17 +203,17 @@ public:
bool isMetaDataAvailable() const { return true; }
QVariant metaData(QtMultimediaKit::MetaData key) const { return m_metaData.value(key); }
void setMetaData(QtMultimediaKit::MetaData key, const QVariant &value) {
QVariant metaData(QtMultimedia::MetaData key) const { return m_metaData.value(key); }
void setMetaData(QtMultimedia::MetaData key, const QVariant &value) {
m_metaData.insert(key, value); emit metaDataChanged(); }
QList<QtMultimediaKit::MetaData> availableMetaData() const { return m_metaData.keys(); }
QList<QtMultimedia::MetaData> availableMetaData() const { return m_metaData.keys(); }
QVariant extendedMetaData(const QString &) const { return QVariant(); }
QStringList availableExtendedMetaData() const { return QStringList(); }
private:
QMap<QtMultimediaKit::MetaData, QVariant> m_metaData;
QMap<QtMultimedia::MetaData, QVariant> m_metaData;
};
class QtTestMediaService : public QMediaService
@@ -1123,29 +1123,29 @@ void tst_QDeclarativeAudio::status()
void tst_QDeclarativeAudio::metaData_data()
{
QTest::addColumn<QByteArray>("propertyName");
QTest::addColumn<QtMultimediaKit::MetaData>("propertyKey");
QTest::addColumn<QtMultimedia::MetaData>("propertyKey");
QTest::addColumn<QVariant>("value");
QTest::newRow("title")
<< QByteArray("title")
<< QtMultimediaKit::Title
<< QtMultimedia::Title
<< QVariant(QString::fromLatin1("This is a title"));
QTest::newRow("genre")
<< QByteArray("genre")
<< QtMultimediaKit::Genre
<< QtMultimedia::Genre
<< QVariant(QString::fromLatin1("rock"));
QTest::newRow("trackNumber")
<< QByteArray("trackNumber")
<< QtMultimediaKit::TrackNumber
<< QtMultimedia::TrackNumber
<< QVariant(8);
}
void tst_QDeclarativeAudio::metaData()
{
QFETCH(QByteArray, propertyName);
QFETCH(QtMultimediaKit::MetaData, propertyKey);
QFETCH(QtMultimedia::MetaData, propertyKey);
QFETCH(QVariant, value);
QtTestMediaServiceProvider provider;

14
tests/auto/qdeclarativevideo/qdeclarativevideo.pro
View File

@@ -1,17 +1,17 @@
load(qttest_p4)
QT += multimediakit-private declarative
QT += multimedia-private declarative
CONFIG += no_private_qt_headers_warning
HEADERS += \
$$QT.multimediakit.sources/../imports/multimedia/qdeclarativevideo_p.h \
$$QT.multimediakit.sources/../imports/multimedia/qdeclarativemediabase_p.h \
$$QT.multimediakit.sources/../imports/multimedia/qdeclarativemediametadata_p.h
$$QT.multimedia.sources/../imports/multimedia/qdeclarativevideo_p.h \
$$QT.multimedia.sources/../imports/multimedia/qdeclarativemediabase_p.h \
$$QT.multimedia.sources/../imports/multimedia/qdeclarativemediametadata_p.h
SOURCES += \
tst_qdeclarativevideo.cpp \
$$QT.multimediakit.sources/../imports/multimedia/qdeclarativevideo.cpp \
$$QT.multimediakit.sources/../imports/multimedia/qdeclarativemediabase.cpp
$$QT.multimedia.sources/../imports/multimedia/qdeclarativevideo.cpp \
$$QT.multimedia.sources/../imports/multimedia/qdeclarativemediabase.cpp
INCLUDEPATH += $$QT.multimediakit.sources/../imports/multimedia
INCLUDEPATH += $$QT.multimedia.sources/../imports/multimedia
QT+=widgets

2
tests/auto/qdeclarativevideo/tst_qdeclarativevideo.cpp
View File

@@ -78,7 +78,7 @@ private slots:
void geometry();
};
Q_DECLARE_METATYPE(QtMultimediaKit::MetaData);
Q_DECLARE_METATYPE(QtMultimedia::MetaData);
Q_DECLARE_METATYPE(QDeclarativeVideo::Error);
class QtTestMediaPlayerControl : public QMediaPlayerControl

2
tests/auto/qgraphicsvideoitem/qgraphicsvideoitem.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
SOURCES += tst_qgraphicsvideoitem.cpp

2
tests/auto/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp
View File

@@ -41,7 +41,7 @@
//TESTED_COMPONENT=src/multimedia
#include <qtmultimediakitdefs.h>
#include <qtmultimediadefs.h>
#include "qgraphicsvideoitem.h"
#include <QtTest/QtTest>
#include "qmediaobject.h"

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

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

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

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

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

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

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

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

2
tests/auto/qmediaimageviewer/tst_qmediaimageviewer.cpp
View File

@@ -41,7 +41,7 @@
//TESTED_COMPONENT=src/multimedia
#include <qtmultimediakitdefs.h>
#include <qtmultimediadefs.h>
#include <QtTest/QtTest>
#include <QtCore/qdir.h>

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

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

2
tests/auto/qmediaimageviewerwidgets/tst_qmediaimageviewerwidgets.cpp
View File

@@ -41,7 +41,7 @@
//TESTED_COMPONENT=src/multimedia
#include <qtmultimediakitdefs.h>
#include <qtmultimediadefs.h>
#include <QtTest/QtTest>
#include <QtCore/qdir.h>

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

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

26
tests/auto/qmediaobject/tst_qmediaobject.cpp
View File

@@ -244,9 +244,9 @@ void tst_QMediaObject::nullMetaDataControl()
QCOMPARE(object.isMetaDataAvailable(), false);
QCOMPARE(object.metaData(QtMultimediaKit::Title).toString(), QString());
QCOMPARE(object.metaData(QtMultimedia::Title).toString(), QString());
QCOMPARE(object.extendedMetaData(titleKey).toString(), QString());
QCOMPARE(object.availableMetaData(), QList<QtMultimediaKit::MetaData>());
QCOMPARE(object.availableMetaData(), QList<QtMultimedia::MetaData>());
QCOMPARE(object.availableExtendedMetaData(), QStringList());
QCOMPARE(spy.count(), 0);
}
@@ -311,18 +311,18 @@ void tst_QMediaObject::metaData()
QtTestMediaObject object(&service);
QVERIFY(object.availableMetaData().isEmpty());
service.metaData.m_data.insert(QtMultimediaKit::AlbumArtist, artist);
service.metaData.m_data.insert(QtMultimediaKit::Title, title);
service.metaData.m_data.insert(QtMultimediaKit::Genre, genre);
service.metaData.m_data.insert(QtMultimedia::AlbumArtist, artist);
service.metaData.m_data.insert(QtMultimedia::Title, title);
service.metaData.m_data.insert(QtMultimedia::Genre, genre);
QCOMPARE(object.metaData(QtMultimediaKit::AlbumArtist).toString(), artist);
QCOMPARE(object.metaData(QtMultimediaKit::Title).toString(), title);
QCOMPARE(object.metaData(QtMultimedia::AlbumArtist).toString(), artist);
QCOMPARE(object.metaData(QtMultimedia::Title).toString(), title);
QList<QtMultimediaKit::MetaData> metaDataKeys = object.availableMetaData();
QList<QtMultimedia::MetaData> metaDataKeys = object.availableMetaData();
QCOMPARE(metaDataKeys.size(), 3);
QVERIFY(metaDataKeys.contains(QtMultimediaKit::AlbumArtist));
QVERIFY(metaDataKeys.contains(QtMultimediaKit::Title));
QVERIFY(metaDataKeys.contains(QtMultimediaKit::Genre));
QVERIFY(metaDataKeys.contains(QtMultimedia::AlbumArtist));
QVERIFY(metaDataKeys.contains(QtMultimedia::Title));
QVERIFY(metaDataKeys.contains(QtMultimedia::Genre));
}
void tst_QMediaObject::extendedMetaData()
@@ -353,12 +353,12 @@ void tst_QMediaObject::availability()
{
QtTestMediaObject nullObject(0);
QCOMPARE(nullObject.isAvailable(), false);
QCOMPARE(nullObject.availabilityError(), QtMultimediaKit::ServiceMissingError);
QCOMPARE(nullObject.availabilityError(), QtMultimedia::ServiceMissingError);
QtTestMetaDataService service;
QtTestMediaObject object(&service);
QCOMPARE(object.isAvailable(), true);
QCOMPARE(object.availabilityError(), QtMultimediaKit::NoError);
QCOMPARE(object.availabilityError(), QtMultimedia::NoError);
}
void tst_QMediaObject::service()

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

@@ -1,6 +1,6 @@
load(qttest_p4)
QT += network multimediakit-private
QT += network multimedia-private
CONFIG += no_private_qt_headers_warning
HEADERS += tst_qmediaplayer.h

4
tests/auto/qmediaplayer/tst_qmediaplayer.cpp
View File

@@ -167,7 +167,7 @@ void tst_QMediaPlayer::testNullService()
QCOMPARE(player.playbackRate(), qreal(0));
QCOMPARE(player.error(), QMediaPlayer::ServiceMissingError);
QCOMPARE(player.isAvailable(), false);
QCOMPARE(player.availabilityError(), QtMultimediaKit::ServiceMissingError);
QCOMPARE(player.availabilityError(), QtMultimedia::ServiceMissingError);
{
QFETCH_GLOBAL(QMediaContent, mediaContent);
@@ -448,7 +448,7 @@ void tst_QMediaPlayer::testErrorString()
void tst_QMediaPlayer::testIsAvailable()
{
QCOMPARE(player->isAvailable(), true);
QCOMPARE(player->availabilityError(), QtMultimediaKit::NoError);
QCOMPARE(player->availabilityError(), QtMultimedia::NoError);
}
void tst_QMediaPlayer::testService()

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

@@ -1,6 +1,6 @@
load(qttest_p4)
QT += multimediakit-private
QT += multimedia-private
CONFIG += no_private_qt_headers_warning
# This is more of a system test

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

@@ -1,6 +1,6 @@
load(qttest_p4)
QT += network multimediakit-private multimediakitwidgets-private
QT += network multimedia-private multimediawidgets-private
CONFIG += no_private_qt_headers_warning
HEADERS += tst_qmediaplayerwidgets.h

8
tests/auto/qmediaplaylist/qmediaplaylist.pro
View File

@@ -5,18 +5,18 @@ CONFIG += insignificant_test
include (../qmultimedia_common/mockplaylist.pri)
QT += multimediakit-private
QT += multimedia-private
CONFIG += no_private_qt_headers_warning
DEFINES += TESTDATA_DIR=\\\"$$PWD/\\\"
HEADERS += \
$$QT.multimediakit.sources/../plugins/m3u/qm3uhandler.h
$$QT.multimedia.sources/../plugins/m3u/qm3uhandler.h
SOURCES += \
tst_qmediaplaylist.cpp \
$$QT.multimediakit.sources/../plugins/m3u/qm3uhandler.cpp
$$QT.multimedia.sources/../plugins/m3u/qm3uhandler.cpp
INCLUDEPATH += $$QT.multimediakit.sources/../plugins/m3u
INCLUDEPATH += $$QT.multimedia.sources/../plugins/m3u
maemo*:CONFIG += insignificant_test

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

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

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

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

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

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

198
tests/auto/qmediarecorder/tst_qmediarecorder.cpp
View File

@@ -135,7 +135,7 @@ void tst_QMediaRecorder::testNullControls()
QAudioEncoderSettings audio;
audio.setCodec(id);
audio.setQuality(QtMultimediaKit::LowQuality);
audio.setQuality(QtMultimedia::LowQuality);
QVideoEncoderSettings video;
video.setCodec(id);
@@ -320,18 +320,18 @@ void tst_QMediaRecorder::testEncodingSettings()
QCOMPARE(audioSettings.codec(), QString("audio/pcm"));
QCOMPARE(audioSettings.bitRate(), 128*1024);
QCOMPARE(audioSettings.sampleRate(), 8000);
QCOMPARE(audioSettings.quality(), QtMultimediaKit::NormalQuality);
QCOMPARE(audioSettings.quality(), QtMultimedia::NormalQuality);
QCOMPARE(audioSettings.channelCount(), -1);
QCOMPARE(audioSettings.encodingMode(), QtMultimediaKit::ConstantQualityEncoding);
QCOMPARE(audioSettings.encodingMode(), QtMultimedia::ConstantQualityEncoding);
QVideoEncoderSettings videoSettings = capture->videoSettings();
QCOMPARE(videoSettings.codec(), QString());
QCOMPARE(videoSettings.bitRate(), -1);
QCOMPARE(videoSettings.resolution(), QSize());
QCOMPARE(videoSettings.frameRate(), 0.0);
QCOMPARE(videoSettings.quality(), QtMultimediaKit::NormalQuality);
QCOMPARE(videoSettings.encodingMode(), QtMultimediaKit::ConstantQualityEncoding);
QCOMPARE(videoSettings.quality(), QtMultimedia::NormalQuality);
QCOMPARE(videoSettings.encodingMode(), QtMultimedia::ConstantQualityEncoding);
QString format = capture->containerMimeType();
QCOMPARE(format, QString());
@@ -339,15 +339,15 @@ void tst_QMediaRecorder::testEncodingSettings()
audioSettings.setCodec("audio/mpeg");
audioSettings.setSampleRate(44100);
audioSettings.setBitRate(256*1024);
audioSettings.setQuality(QtMultimediaKit::HighQuality);
audioSettings.setEncodingMode(QtMultimediaKit::AverageBitRateEncoding);
audioSettings.setQuality(QtMultimedia::HighQuality);
audioSettings.setEncodingMode(QtMultimedia::AverageBitRateEncoding);
videoSettings.setCodec("video/3gpp");
videoSettings.setBitRate(800);
videoSettings.setFrameRate(24*1024);
videoSettings.setResolution(QSize(800,600));
videoSettings.setQuality(QtMultimediaKit::HighQuality);
audioSettings.setEncodingMode(QtMultimediaKit::TwoPassEncoding);
videoSettings.setQuality(QtMultimedia::HighQuality);
audioSettings.setEncodingMode(QtMultimedia::TwoPassEncoding);
format = QString("mov");
@@ -377,9 +377,9 @@ void tst_QMediaRecorder::testAudioSettings()
QVERIFY(!settings.isNull());
settings = QAudioEncoderSettings();
QCOMPARE(settings.quality(), QtMultimediaKit::NormalQuality);
settings.setQuality(QtMultimediaKit::HighQuality);
QCOMPARE(settings.quality(), QtMultimediaKit::HighQuality);
QCOMPARE(settings.quality(), QtMultimedia::NormalQuality);
settings.setQuality(QtMultimedia::HighQuality);
QCOMPARE(settings.quality(), QtMultimedia::HighQuality);
QVERIFY(!settings.isNull());
settings = QAudioEncoderSettings();
@@ -398,7 +398,7 @@ void tst_QMediaRecorder::testAudioSettings()
QVERIFY(settings.isNull());
QCOMPARE(settings.codec(), QString());
QCOMPARE(settings.bitRate(), -1);
QCOMPARE(settings.quality(), QtMultimediaKit::NormalQuality);
QCOMPARE(settings.quality(), QtMultimedia::NormalQuality);
QCOMPARE(settings.sampleRate(), -1);
{
@@ -410,7 +410,7 @@ void tst_QMediaRecorder::testAudioSettings()
QCOMPARE(settings2, settings1);
QVERIFY(settings2.isNull());
settings1.setQuality(QtMultimediaKit::HighQuality);
settings1.setQuality(QtMultimedia::HighQuality);
QVERIFY(settings2.isNull());
QVERIFY(!settings1.isNull());
@@ -426,7 +426,7 @@ void tst_QMediaRecorder::testAudioSettings()
QCOMPARE(settings2, settings1);
QVERIFY(settings2.isNull());
settings1.setQuality(QtMultimediaKit::HighQuality);
settings1.setQuality(QtMultimedia::HighQuality);
QVERIFY(settings2.isNull());
QVERIFY(!settings1.isNull());
@@ -458,19 +458,19 @@ void tst_QMediaRecorder::testAudioSettings()
QVERIFY(settings1 != settings2);
settings1 = QAudioEncoderSettings();
settings1.setEncodingMode(QtMultimediaKit::ConstantBitRateEncoding);
settings1.setEncodingMode(QtMultimedia::ConstantBitRateEncoding);
settings2 = QAudioEncoderSettings();
settings2.setEncodingMode(QtMultimediaKit::ConstantBitRateEncoding);
settings2.setEncodingMode(QtMultimedia::ConstantBitRateEncoding);
QVERIFY(settings1 == settings2);
settings2.setEncodingMode(QtMultimediaKit::TwoPassEncoding);
settings2.setEncodingMode(QtMultimedia::TwoPassEncoding);
QVERIFY(settings1 != settings2);
settings1 = QAudioEncoderSettings();
settings1.setQuality(QtMultimediaKit::NormalQuality);
settings1.setQuality(QtMultimedia::NormalQuality);
settings2 = QAudioEncoderSettings();
settings2.setQuality(QtMultimediaKit::NormalQuality);
settings2.setQuality(QtMultimedia::NormalQuality);
QVERIFY(settings1 == settings2);
settings2.setQuality(QtMultimediaKit::LowQuality);
settings2.setQuality(QtMultimedia::LowQuality);
QVERIFY(settings1 != settings2);
settings1 = QAudioEncoderSettings();
@@ -501,9 +501,9 @@ void tst_QMediaRecorder::testVideoSettings()
QVERIFY(!settings.isNull());
settings = QVideoEncoderSettings();
QCOMPARE(settings.quality(), QtMultimediaKit::NormalQuality);
settings.setQuality(QtMultimediaKit::HighQuality);
QCOMPARE(settings.quality(), QtMultimediaKit::HighQuality);
QCOMPARE(settings.quality(), QtMultimedia::NormalQuality);
settings.setQuality(QtMultimedia::HighQuality);
QCOMPARE(settings.quality(), QtMultimedia::HighQuality);
QVERIFY(!settings.isNull());
settings = QVideoEncoderSettings();
@@ -526,7 +526,7 @@ void tst_QMediaRecorder::testVideoSettings()
QVERIFY(settings.isNull());
QCOMPARE(settings.codec(), QString());
QCOMPARE(settings.bitRate(), -1);
QCOMPARE(settings.quality(), QtMultimediaKit::NormalQuality);
QCOMPARE(settings.quality(), QtMultimedia::NormalQuality);
QCOMPARE(settings.frameRate(), qreal());
QCOMPARE(settings.resolution(), QSize());
@@ -539,7 +539,7 @@ void tst_QMediaRecorder::testVideoSettings()
QCOMPARE(settings2, settings1);
QVERIFY(settings2.isNull());
settings1.setQuality(QtMultimediaKit::HighQuality);
settings1.setQuality(QtMultimedia::HighQuality);
QVERIFY(settings2.isNull());
QVERIFY(!settings1.isNull());
@@ -555,7 +555,7 @@ void tst_QMediaRecorder::testVideoSettings()
QCOMPARE(settings2, settings1);
QVERIFY(settings2.isNull());
settings1.setQuality(QtMultimediaKit::HighQuality);
settings1.setQuality(QtMultimedia::HighQuality);
QVERIFY(settings2.isNull());
QVERIFY(!settings1.isNull());
@@ -587,19 +587,19 @@ void tst_QMediaRecorder::testVideoSettings()
QVERIFY(settings1 != settings2);
settings1 = QVideoEncoderSettings();
settings1.setEncodingMode(QtMultimediaKit::ConstantBitRateEncoding);
settings1.setEncodingMode(QtMultimedia::ConstantBitRateEncoding);
settings2 = QVideoEncoderSettings();
settings2.setEncodingMode(QtMultimediaKit::ConstantBitRateEncoding);
settings2.setEncodingMode(QtMultimedia::ConstantBitRateEncoding);
QVERIFY(settings1 == settings2);
settings2.setEncodingMode(QtMultimediaKit::TwoPassEncoding);
settings2.setEncodingMode(QtMultimedia::TwoPassEncoding);
QVERIFY(settings1 != settings2);
settings1 = QVideoEncoderSettings();
settings1.setQuality(QtMultimediaKit::NormalQuality);
settings1.setQuality(QtMultimedia::NormalQuality);
settings2 = QVideoEncoderSettings();
settings2.setQuality(QtMultimediaKit::NormalQuality);
settings2.setQuality(QtMultimedia::NormalQuality);
QVERIFY(settings1 == settings2);
settings2.setQuality(QtMultimediaKit::LowQuality);
settings2.setQuality(QtMultimedia::LowQuality);
QVERIFY(settings1 != settings2);
settings1 = QVideoEncoderSettings();
@@ -629,12 +629,12 @@ void tst_QMediaRecorder::nullMetaDataControl()
QCOMPARE(recorder.isMetaDataAvailable(), false);
QCOMPARE(recorder.isMetaDataWritable(), false);
recorder.setMetaData(QtMultimediaKit::Title, title);
recorder.setMetaData(QtMultimedia::Title, title);
recorder.setExtendedMetaData(titleKey, title);
QCOMPARE(recorder.metaData(QtMultimediaKit::Title).toString(), QString());
QCOMPARE(recorder.metaData(QtMultimedia::Title).toString(), QString());
QCOMPARE(recorder.extendedMetaData(titleKey).toString(), QString());
QCOMPARE(recorder.availableMetaData(), QList<QtMultimediaKit::MetaData>());
QCOMPARE(recorder.availableMetaData(), QList<QtMultimedia::MetaData>());
QCOMPARE(recorder.availableExtendedMetaData(), QStringList());
QCOMPARE(spy.count(), 0);
}
@@ -734,18 +734,18 @@ void tst_QMediaRecorder::metaData()
QMediaRecorder recorder(&object);
QVERIFY(object.availableMetaData().isEmpty());
service.mockMetaDataControl->m_data.insert(QtMultimediaKit::AlbumArtist, artist);
service.mockMetaDataControl->m_data.insert(QtMultimediaKit::Title, title);
service.mockMetaDataControl->m_data.insert(QtMultimediaKit::Genre, genre);
service.mockMetaDataControl->m_data.insert(QtMultimedia::AlbumArtist, artist);
service.mockMetaDataControl->m_data.insert(QtMultimedia::Title, title);
service.mockMetaDataControl->m_data.insert(QtMultimedia::Genre, genre);
QCOMPARE(recorder.metaData(QtMultimediaKit::AlbumArtist).toString(), artist);
QCOMPARE(recorder.metaData(QtMultimediaKit::Title).toString(), title);
QCOMPARE(recorder.metaData(QtMultimedia::AlbumArtist).toString(), artist);
QCOMPARE(recorder.metaData(QtMultimedia::Title).toString(), title);
QList<QtMultimediaKit::MetaData> metaDataKeys = recorder.availableMetaData();
QList<QtMultimedia::MetaData> metaDataKeys = recorder.availableMetaData();
QCOMPARE(metaDataKeys.size(), 3);
QVERIFY(metaDataKeys.contains(QtMultimediaKit::AlbumArtist));
QVERIFY(metaDataKeys.contains(QtMultimediaKit::Title));
QVERIFY(metaDataKeys.contains(QtMultimediaKit::Genre));
QVERIFY(metaDataKeys.contains(QtMultimedia::AlbumArtist));
QVERIFY(metaDataKeys.contains(QtMultimedia::Title));
QVERIFY(metaDataKeys.contains(QtMultimedia::Genre));
}
void tst_QMediaRecorder::setMetaData_data()
@@ -768,9 +768,9 @@ void tst_QMediaRecorder::setMetaData()
QMediaRecorder recorder(&object);
recorder.setMetaData(QtMultimediaKit::Title, title);
QCOMPARE(recorder.metaData(QtMultimediaKit::Title).toString(), title);
QCOMPARE(service.mockMetaDataControl->m_data.value(QtMultimediaKit::Title).toString(), title);
recorder.setMetaData(QtMultimedia::Title, title);
QCOMPARE(recorder.metaData(QtMultimedia::Title).toString(), title);
QCOMPARE(service.mockMetaDataControl->m_data.value(QtMultimedia::Title).toString(), title);
}
void tst_QMediaRecorder::extendedMetaData()
@@ -828,8 +828,8 @@ void tst_QMediaRecorder::testAudioSettingsCopyConstructor()
audiosettings.setBitRate(128*1000);
audiosettings.setChannelCount(4);
audiosettings.setCodec("audio/pcm");
audiosettings.setEncodingMode(QtMultimediaKit::ConstantBitRateEncoding);
audiosettings.setQuality(QtMultimediaKit::LowQuality);
audiosettings.setEncodingMode(QtMultimedia::ConstantBitRateEncoding);
audiosettings.setQuality(QtMultimedia::LowQuality);
audiosettings.setSampleRate(44100);
/* Copy constructor */
@@ -858,16 +858,16 @@ void tst_QMediaRecorder::testAudioSettingsOperatorNotEqual()
audiosettings1.setBitRate(128*1000);
audiosettings1.setChannelCount(4);
audiosettings1.setCodec("audio/pcm");
audiosettings1.setEncodingMode(QtMultimediaKit::ConstantBitRateEncoding);
audiosettings1.setQuality(QtMultimediaKit::LowQuality);
audiosettings1.setEncodingMode(QtMultimedia::ConstantBitRateEncoding);
audiosettings1.setQuality(QtMultimedia::LowQuality);
audiosettings1.setSampleRate(44100);
/* setting the desired properties for the AudioEncoder */
audiosettings2.setBitRate(128*1000);
audiosettings2.setChannelCount(4);
audiosettings2.setCodec("audio/pcm");
audiosettings2.setEncodingMode(QtMultimediaKit::ConstantBitRateEncoding);
audiosettings2.setQuality(QtMultimediaKit::LowQuality);
audiosettings2.setEncodingMode(QtMultimedia::ConstantBitRateEncoding);
audiosettings2.setQuality(QtMultimedia::LowQuality);
audiosettings2.setSampleRate(44100);
/* verify the both are equal or not */
@@ -875,7 +875,7 @@ void tst_QMediaRecorder::testAudioSettingsOperatorNotEqual()
/* Modify the settings value for one object */
audiosettings2.setBitRate(64*1000);
audiosettings2.setEncodingMode(QtMultimediaKit::ConstantQualityEncoding);
audiosettings2.setEncodingMode(QtMultimedia::ConstantQualityEncoding);
/* verify the not equal opertor */
QVERIFY(audiosettings1 != audiosettings2);
@@ -894,8 +894,8 @@ void tst_QMediaRecorder::testAudioSettingsOperatorEqual()
audiosettings1.setBitRate(128*1000);
audiosettings1.setChannelCount(4);
audiosettings1.setCodec("audio/pcm");
audiosettings1.setEncodingMode(QtMultimediaKit::ConstantBitRateEncoding);
audiosettings1.setQuality(QtMultimediaKit::LowQuality);
audiosettings1.setEncodingMode(QtMultimedia::ConstantBitRateEncoding);
audiosettings1.setQuality(QtMultimedia::LowQuality);
audiosettings1.setSampleRate(44100);
QAudioEncoderSettings audiosettings2;
@@ -905,8 +905,8 @@ void tst_QMediaRecorder::testAudioSettingsOperatorEqual()
audiosettings2.setBitRate(128*1000);
audiosettings2.setChannelCount(4);
audiosettings2.setCodec("audio/pcm");
audiosettings2.setEncodingMode(QtMultimediaKit::ConstantBitRateEncoding);
audiosettings2.setQuality(QtMultimediaKit::LowQuality);
audiosettings2.setEncodingMode(QtMultimedia::ConstantBitRateEncoding);
audiosettings2.setQuality(QtMultimedia::LowQuality);
audiosettings2.setSampleRate(44100);
/* verify both the values are same or not */
@@ -926,8 +926,8 @@ void tst_QMediaRecorder::testAudioSettingsOperatorAssign()
audiosettings1.setBitRate(128*1000);
audiosettings1.setChannelCount(4);
audiosettings1.setCodec("audio/pcm");
audiosettings1.setEncodingMode(QtMultimediaKit::ConstantBitRateEncoding);
audiosettings1.setQuality(QtMultimediaKit::LowQuality);
audiosettings1.setEncodingMode(QtMultimedia::ConstantBitRateEncoding);
audiosettings1.setQuality(QtMultimedia::LowQuality);
audiosettings1.setSampleRate(44100);
QAudioEncoderSettings audiosettings2;
@@ -958,14 +958,14 @@ void tst_QMediaRecorder::testAvailabilityError()
MockMediaRecorderService service(0, 0);
MockMediaObject object(0, &service);
QMediaRecorder recorder(&object);
QCOMPARE(recorder.availabilityError(), QtMultimediaKit::ServiceMissingError);
QCOMPARE(recorder.availabilityError(), QtMultimedia::ServiceMissingError);
MockMediaRecorderControl recorderControl(0);
MockMediaRecorderService service1(0, &recorderControl);
service1.mockMetaDataControl->populateMetaData();
MockMediaObject object1(0, &service1);
QMediaRecorder recorder1(&object1);
QCOMPARE(recorder1.availabilityError(), QtMultimediaKit::NoError);
QCOMPARE(recorder1.availabilityError(), QtMultimedia::NoError);
}
/* isAvailable() API test. */
@@ -1026,21 +1026,21 @@ void tst_QMediaRecorder::testVideoSettingsQuality()
QVERIFY(settings == QVideoEncoderSettings());
/* Verify the default value is intialised correctly*/
QCOMPARE(settings.quality(), QtMultimediaKit::NormalQuality);
QCOMPARE(settings.quality(), QtMultimedia::NormalQuality);
/* Set all types of Quality parameter and Verify if it is set correctly*/
settings.setQuality(QtMultimediaKit::HighQuality);
QCOMPARE(settings.quality(), QtMultimediaKit::HighQuality);
settings.setQuality(QtMultimedia::HighQuality);
QCOMPARE(settings.quality(), QtMultimedia::HighQuality);
QVERIFY(!settings.isNull());
settings.setQuality(QtMultimediaKit::VeryLowQuality);
QCOMPARE(settings.quality(), QtMultimediaKit::VeryLowQuality);
settings.setQuality(QtMultimedia::VeryLowQuality);
QCOMPARE(settings.quality(), QtMultimedia::VeryLowQuality);
settings.setQuality(QtMultimediaKit::LowQuality);
QCOMPARE(settings.quality(), QtMultimediaKit::LowQuality);
settings.setQuality(QtMultimedia::LowQuality);
QCOMPARE(settings.quality(), QtMultimedia::LowQuality);
settings.setQuality(QtMultimediaKit::VeryHighQuality);
QCOMPARE(settings.quality(), QtMultimediaKit::VeryHighQuality);
settings.setQuality(QtMultimedia::VeryHighQuality);
QCOMPARE(settings.quality(), QtMultimedia::VeryHighQuality);
}
/* Test QVideoEncoderSettings encodingMode */
@@ -1052,19 +1052,19 @@ void tst_QMediaRecorder::testVideoSettingsEncodingMode()
QVERIFY(settings == QVideoEncoderSettings());
/* Verify the default values are initialised correctly*/
QCOMPARE(settings.encodingMode(), QtMultimediaKit::ConstantQualityEncoding);
QCOMPARE(settings.encodingMode(), QtMultimedia::ConstantQualityEncoding);
QVERIFY(settings.isNull());
/* Set each type of encoding mode and Verify if it is set correctly*/
settings.setEncodingMode(QtMultimediaKit::ConstantBitRateEncoding);
QCOMPARE(settings.encodingMode(),QtMultimediaKit::ConstantBitRateEncoding);
settings.setEncodingMode(QtMultimedia::ConstantBitRateEncoding);
QCOMPARE(settings.encodingMode(),QtMultimedia::ConstantBitRateEncoding);
QVERIFY(!settings.isNull());
settings.setEncodingMode(QtMultimediaKit::AverageBitRateEncoding);
QCOMPARE(settings.encodingMode(), QtMultimediaKit::AverageBitRateEncoding);
settings.setEncodingMode(QtMultimedia::AverageBitRateEncoding);
QCOMPARE(settings.encodingMode(), QtMultimedia::AverageBitRateEncoding);
settings.setEncodingMode(QtMultimediaKit::TwoPassEncoding);
QCOMPARE(settings.encodingMode(), QtMultimediaKit::TwoPassEncoding);
settings.setEncodingMode(QtMultimedia::TwoPassEncoding);
QCOMPARE(settings.encodingMode(), QtMultimedia::TwoPassEncoding);
}
/* Test QVideoEncoderSettings copy constructor */
@@ -1074,8 +1074,8 @@ void tst_QMediaRecorder::testVideoSettingsCopyConstructor()
QVideoEncoderSettings settings1;
settings1.setCodec(QLatin1String("codecName"));
settings1.setBitRate(128000);
settings1.setQuality(QtMultimediaKit::HighQuality);
settings1.setEncodingMode(QtMultimediaKit::ConstantBitRateEncoding);
settings1.setQuality(QtMultimedia::HighQuality);
settings1.setEncodingMode(QtMultimedia::ConstantBitRateEncoding);
settings1.setFrameRate(30000.0/10001);
settings1.setResolution(QSize(320,240));
@@ -1086,10 +1086,10 @@ void tst_QMediaRecorder::testVideoSettingsCopyConstructor()
QCOMPARE(settings2 != settings1, false);
QCOMPARE(settings2.codec(), QLatin1String("codecName"));
QCOMPARE(settings2.bitRate(), 128000);
QCOMPARE(settings2.encodingMode(), QtMultimediaKit::ConstantBitRateEncoding);
QCOMPARE(settings2.encodingMode(), QtMultimedia::ConstantBitRateEncoding);
QVERIFY(qFuzzyCompare(settings2.frameRate(), qreal(30000.0/10001)));
QCOMPARE(settings2.resolution(), QSize(320,240));
QCOMPARE(settings2.quality(), QtMultimediaKit::HighQuality);
QCOMPARE(settings2.quality(), QtMultimedia::HighQuality);
/* Verify both the instances are equal*/
QCOMPARE(settings2, settings1);
@@ -1108,10 +1108,10 @@ void tst_QMediaRecorder::testVideoSettingsOperatorAssignment()
/* Initialize all the parameters */
settings1.setCodec(QLatin1String("codecName"));
settings1.setBitRate(128000);
settings1.setEncodingMode(QtMultimediaKit::ConstantBitRateEncoding);
settings1.setEncodingMode(QtMultimedia::ConstantBitRateEncoding);
settings1.setFrameRate(30000.0/10001);
settings1.setResolution(QSize(320,240));
settings1.setQuality(QtMultimediaKit::HighQuality);
settings1.setQuality(QtMultimedia::HighQuality);
/* Assign one object to other*/
settings2 = settings1;
@@ -1119,10 +1119,10 @@ void tst_QMediaRecorder::testVideoSettingsOperatorAssignment()
QCOMPARE(settings2, settings1);
QCOMPARE(settings2.codec(), QLatin1String("codecName"));
QCOMPARE(settings2.bitRate(), 128000);
QCOMPARE(settings2.encodingMode(), QtMultimediaKit::ConstantBitRateEncoding);
QCOMPARE(settings2.encodingMode(), QtMultimedia::ConstantBitRateEncoding);
QVERIFY(qFuzzyCompare(settings2.frameRate(), qreal(30000.0/10001)));
QCOMPARE(settings2.resolution(), QSize(320,240));
QCOMPARE(settings2.quality(), QtMultimediaKit::HighQuality);
QCOMPARE(settings2.quality(), QtMultimedia::HighQuality);
QCOMPARE(settings2, settings1);
QVERIFY(!settings2.isNull());
}
@@ -1165,23 +1165,23 @@ void tst_QMediaRecorder::testVideoSettingsOperatorNotEqual()
/* Verify EncodingMode with not equal operator*/
settings1 = QVideoEncoderSettings();
settings1.setEncodingMode(QtMultimediaKit::ConstantBitRateEncoding);
settings1.setEncodingMode(QtMultimedia::ConstantBitRateEncoding);
settings2 = QVideoEncoderSettings();
settings2.setEncodingMode(QtMultimediaKit::ConstantBitRateEncoding);
settings2.setEncodingMode(QtMultimedia::ConstantBitRateEncoding);
/* OperatorNotEqual returns false when both objects are equal*/
QCOMPARE(settings1 != settings2, false);
settings2.setEncodingMode(QtMultimediaKit::TwoPassEncoding);
settings2.setEncodingMode(QtMultimedia::TwoPassEncoding);
/* OperatorNotEqual returns true when both objects are not equal*/
QVERIFY(settings1 != settings2);
/* Verify Quality with not equal operator*/
settings1 = QVideoEncoderSettings();
settings1.setQuality(QtMultimediaKit::NormalQuality);
settings1.setQuality(QtMultimedia::NormalQuality);
settings2 = QVideoEncoderSettings();
settings2.setQuality(QtMultimediaKit::NormalQuality);
settings2.setQuality(QtMultimedia::NormalQuality);
/* OperatorNotEqual returns false when both objects are equal*/
QCOMPARE(settings1 != settings2, false);
settings2.setQuality(QtMultimediaKit::LowQuality);
settings2.setQuality(QtMultimedia::LowQuality);
/* OperatorNotEqual returns true when both objects are not equal*/
QVERIFY(settings1 != settings2);
@@ -1236,23 +1236,23 @@ void tst_QMediaRecorder::testVideoSettingsOperatorComparison()
/* Verify EncodingMode with comparison operator*/
settings1 = QVideoEncoderSettings();
settings1.setEncodingMode(QtMultimediaKit::ConstantBitRateEncoding);
settings1.setEncodingMode(QtMultimedia::ConstantBitRateEncoding);
settings2 = QVideoEncoderSettings();
settings2.setEncodingMode(QtMultimediaKit::ConstantBitRateEncoding);
settings2.setEncodingMode(QtMultimedia::ConstantBitRateEncoding);
/* Comparison operator returns true when both objects are equal*/
QVERIFY(settings1 == settings2);
settings2.setEncodingMode(QtMultimediaKit::TwoPassEncoding);
settings2.setEncodingMode(QtMultimedia::TwoPassEncoding);
/* Comparison operator returns false when both objects are not equal*/
QCOMPARE(settings1 == settings2, false);
/* Verify Quality with comparison operator*/
settings1 = QVideoEncoderSettings();
settings1.setQuality(QtMultimediaKit::NormalQuality);
settings1.setQuality(QtMultimedia::NormalQuality);
settings2 = QVideoEncoderSettings();
settings2.setQuality(QtMultimediaKit::NormalQuality);
settings2.setQuality(QtMultimedia::NormalQuality);
/* Comparison operator returns true when both objects are equal*/
QVERIFY(settings1 == settings2);
settings2.setQuality(QtMultimediaKit::LowQuality);
settings2.setQuality(QtMultimedia::LowQuality);
/* Comparison operator returns false when both objects are not equal*/
QCOMPARE(settings1 == settings2, false);

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

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

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

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

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

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

50
tests/auto/qmediaserviceprovider/tst_qmediaserviceprovider.cpp
View File

@@ -93,16 +93,16 @@ public:
delete service;
}
QtMultimediaKit::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const
QtMultimedia::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const
{
if (codecs.contains(QLatin1String("mpeg4")))
return QtMultimediaKit::NotSupported;
return QtMultimedia::NotSupported;
if (mimeType == "audio/ogg") {
return QtMultimediaKit::ProbablySupported;
return QtMultimedia::ProbablySupported;
}
return QtMultimediaKit::MaybeSupported;
return QtMultimedia::MaybeSupported;
}
QStringList supportedMimeTypes() const
@@ -152,14 +152,14 @@ public:
delete service;
}
QtMultimediaKit::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const
QtMultimedia::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const
{
Q_UNUSED(codecs);
if (mimeType == "audio/wav")
return QtMultimediaKit::PreferredService;
return QtMultimedia::PreferredService;
return QtMultimediaKit::NotSupported;
return QtMultimedia::NotSupported;
}
QStringList supportedMimeTypes() const
@@ -247,15 +247,15 @@ public:
delete service;
}
QtMultimediaKit::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const
QtMultimedia::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const
{
if (codecs.contains(QLatin1String("jpeg2000")))
return QtMultimediaKit::NotSupported;
return QtMultimedia::NotSupported;
if (supportedMimeTypes().contains(mimeType))
return QtMultimediaKit::ProbablySupported;
return QtMultimedia::ProbablySupported;
return QtMultimediaKit::MaybeSupported;
return QtMultimedia::MaybeSupported;
}
QStringList supportedMimeTypes() const
@@ -342,7 +342,7 @@ void tst_QMediaServiceProvider::testHasSupport()
{
MockMediaServiceProvider mockProvider;
QCOMPARE(mockProvider.hasSupport(QByteArray(Q_MEDIASERVICE_MEDIAPLAYER), "video/ogv", QStringList()),
QtMultimediaKit::MaybeSupported);
QtMultimedia::MaybeSupported);
QMediaServiceProvider *provider = QMediaServiceProvider::defaultServiceProvider();
@@ -350,44 +350,44 @@ void tst_QMediaServiceProvider::testHasSupport()
QSKIP("No default provider", SkipSingle);
QCOMPARE(provider->hasSupport(QByteArray(Q_MEDIASERVICE_MEDIAPLAYER), "video/ogv", QStringList()),
QtMultimediaKit::MaybeSupported);
QtMultimedia::MaybeSupported);
QCOMPARE(provider->hasSupport(QByteArray(Q_MEDIASERVICE_MEDIAPLAYER), "audio/ogg", QStringList()),
QtMultimediaKit::ProbablySupported);
QtMultimedia::ProbablySupported);
//while the service returns PreferredService, provider should return ProbablySupported
QCOMPARE(provider->hasSupport(QByteArray(Q_MEDIASERVICE_MEDIAPLAYER), "audio/wav", QStringList()),
QtMultimediaKit::ProbablySupported);
QtMultimedia::ProbablySupported);
//even while all the plugins with "hasSupport" returned NotSupported,
//MockServicePlugin3 has no "hasSupport" interface, so MaybeSupported
QCOMPARE(provider->hasSupport(QByteArray(Q_MEDIASERVICE_MEDIAPLAYER), "video/avi",
QStringList() << "mpeg4"),
QtMultimediaKit::MaybeSupported);
QtMultimedia::MaybeSupported);
QCOMPARE(provider->hasSupport(QByteArray("non existing service"), "video/ogv", QStringList()),
QtMultimediaKit::NotSupported);
QtMultimedia::NotSupported);
QCOMPARE(QMediaPlayer::hasSupport("video/ogv"), QtMultimediaKit::MaybeSupported);
QCOMPARE(QMediaPlayer::hasSupport("audio/ogg"), QtMultimediaKit::ProbablySupported);
QCOMPARE(QMediaPlayer::hasSupport("audio/wav"), QtMultimediaKit::ProbablySupported);
QCOMPARE(QMediaPlayer::hasSupport("video/ogv"), QtMultimedia::MaybeSupported);
QCOMPARE(QMediaPlayer::hasSupport("audio/ogg"), QtMultimedia::ProbablySupported);
QCOMPARE(QMediaPlayer::hasSupport("audio/wav"), QtMultimedia::ProbablySupported);
//test low latency flag support
QCOMPARE(QMediaPlayer::hasSupport("audio/wav", QStringList(), QMediaPlayer::LowLatency),
QtMultimediaKit::ProbablySupported);
QtMultimedia::ProbablySupported);
//plugin1 probably supports audio/ogg, it checked because it doesn't provide features iface
QCOMPARE(QMediaPlayer::hasSupport("audio/ogg", QStringList(), QMediaPlayer::LowLatency),
QtMultimediaKit::ProbablySupported);
QtMultimedia::ProbablySupported);
//Plugin4 is not checked here, sine it's known not support low latency
QCOMPARE(QMediaPlayer::hasSupport("video/quicktime", QStringList(), QMediaPlayer::LowLatency),
QtMultimediaKit::MaybeSupported);
QtMultimedia::MaybeSupported);
//test streaming flag support
QCOMPARE(QMediaPlayer::hasSupport("video/quicktime", QStringList(), QMediaPlayer::StreamPlayback),
QtMultimediaKit::ProbablySupported);
QtMultimedia::ProbablySupported);
//Plugin2 is not checked here, sine it's known not support streaming
QCOMPARE(QMediaPlayer::hasSupport("audio/wav", QStringList(), QMediaPlayer::StreamPlayback),
QtMultimediaKit::MaybeSupported);
QtMultimedia::MaybeSupported);
//ensure the correct media player plugin is chosen for mime type
QMediaPlayer simplePlayer(0, QMediaPlayer::LowLatency);

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

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

12
tests/auto/qmediastreamscontrol/tst_qmediastreamscontrol.cpp
View File

@@ -126,13 +126,13 @@ public:
streams[index].type = type;
}
QVariant metaData(int index, QtMultimediaKit::MetaData key)
QVariant metaData(int index, QtMultimedia::MetaData key)
{
QtMultimediaKit::MetaData keys = key;
QtMultimedia::MetaData keys = key;
return keys;
}
void setMetaData(int index, QtMultimediaKit::MetaData key, const QVariant &value)
void setMetaData(int index, QtMultimedia::MetaData key, const QVariant &value)
{
streams[index].metaData.insert(key, value);
}
@@ -191,7 +191,7 @@ public:
{
Stream() : type(UnknownStream), active(false) {}
StreamType type;
QMap<QtMultimediaKit::MetaData, QVariant> metaData;
QMap<QtMultimedia::MetaData, QVariant> metaData;
bool active;
};
@@ -400,8 +400,8 @@ void tst_qmediastreamscontrol::streamsChanged()
void tst_qmediastreamscontrol::metadata()
{
QtTestMediaStreamsControl m_metadata;
m_metadata.metaData(1,QtMultimediaKit::AlbumArtist);
qDebug() << m_metadata.metaData(1,QtMultimediaKit::AlbumArtist);
m_metadata.metaData(1,QtMultimedia::AlbumArtist);
qDebug() << m_metadata.metaData(1,QtMultimedia::AlbumArtist);
}
QTEST_MAIN(tst_qmediastreamscontrol);

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

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

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

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

2
tests/auto/qmetadatareadercontrol/tst_qmetadatareadercontrol.cpp
View File

@@ -103,7 +103,7 @@ void tst_QMetaDataReaderControl::metaDataReaderControlMetaData ()
{
MockMetaDataReaderControl *metaData = new MockMetaDataReaderControl();
QVERIFY(metaData !=NULL);
metaData->metaData(QtMultimediaKit::Title);
metaData->metaData(QtMultimedia::Title);
delete metaData;
}

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;

4
tests/auto/qmultimedia_common/mockcameraimagecapturecontrol.h
View File

@@ -95,11 +95,11 @@ private Q_SLOTS:
emit imageCaptured(m_captureRequest, QImage());
emit imageMetadataAvailable(m_captureRequest,
QtMultimediaKit::FocalLengthIn35mmFilm,
QtMultimedia::FocalLengthIn35mmFilm,
QVariant(50));
emit imageMetadataAvailable(m_captureRequest,
QtMultimediaKit::DateTimeOriginal,
QtMultimedia::DateTimeOriginal,
QVariant(QDateTime::currentDateTime()));
emit imageMetadataAvailable(m_captureRequest,

10
tests/auto/qmultimedia_common/mockcameraservice.h
View File

@@ -56,7 +56,7 @@
#include "../qmultimedia_common/mockvideosurface.h"
#include "../qmultimedia_common/mockvideorenderercontrol.h"
#if defined(QT_MULTIMEDIAKIT_MOCK_WIDGETS)
#if defined(QT_MULTIMEDIA_MOCK_WIDGETS)
#include "../qmultimedia_common/mockvideowindowcontrol.h"
#endif
@@ -105,7 +105,7 @@ public:
mockImageProcessingControl = new MockImageProcessingControl(this);
mockImageEncoderControl = new MockImageEncoderControl(this);
rendererControl = new MockVideoRendererControl(this);
#if defined(QT_MULTIMEDIAKIT_MOCK_WIDGETS)
#if defined(QT_MULTIMEDIA_MOCK_WIDGETS)
windowControl = new MockVideoWindowControl(this);
#endif
rendererRef = 0;
@@ -154,7 +154,7 @@ public:
return rendererControl;
}
}
#if defined(QT_MULTIMEDIAKIT_MOCK_WIDGETS)
#if defined(QT_MULTIMEDIA_MOCK_WIDGETS)
if (qstrcmp(iid, QVideoWindowControl_iid) == 0) {
if (windowRef == 0) {
windowRef += 1;
@@ -169,7 +169,7 @@ public:
{
if (control == rendererControl)
rendererRef -= 1;
#if defined(QT_MULTIMEDIAKIT_MOCK_WIDGETS)
#if defined(QT_MULTIMEDIA_MOCK_WIDGETS)
if (control == windowControl)
windowRef -= 1;
#endif
@@ -186,7 +186,7 @@ public:
MockImageProcessingControl *mockImageProcessingControl;
MockImageEncoderControl *mockImageEncoderControl;
MockVideoRendererControl *rendererControl;
#if defined(QT_MULTIMEDIAKIT_MOCK_WIDGETS)
#if defined(QT_MULTIMEDIA_MOCK_WIDGETS)
MockVideoWindowControl *windowControl;
#endif
int rendererRef;

4
tests/auto/qmultimedia_common/mockimageencodercontrol.h
View File

@@ -65,12 +65,12 @@ public:
settings.resolution() == QSize(320,240))
resolutions << settings.resolution();
if (settings.quality() == QtMultimediaKit::HighQuality && settings.resolution() == QSize(640,480))
if (settings.quality() == QtMultimedia::HighQuality && settings.resolution() == QSize(640,480))
resolutions << settings.resolution();
} else {
resolutions << QSize(160, 120);
resolutions << QSize(320, 240);
if (settings.quality() == QtMultimediaKit::HighQuality)
if (settings.quality() == QtMultimedia::HighQuality)
resolutions << QSize(640, 480);
}

12
tests/auto/qmultimedia_common/mockmediaplayerservice.h
View File

@@ -48,7 +48,7 @@
#include "mockmediastreamscontrol.h"
#include "mockmedianetworkaccesscontrol.h"
#include "mockvideorenderercontrol.h"
#if defined(QT_MULTIMEDIAKIT_MOCK_WIDGETS)
#if defined(QT_MULTIMEDIA_MOCK_WIDGETS)
#include "mockvideowindowcontrol.h"
#endif
@@ -64,7 +64,7 @@ public:
mockNetworkControl = new MockNetworkAccessControl;
rendererControl = new MockVideoRendererControl;
rendererRef = 0;
#if defined(QT_MULTIMEDIAKIT_MOCK_WIDGETS)
#if defined(QT_MULTIMEDIA_MOCK_WIDGETS)
windowControl = new MockVideoWindowControl;
windowRef = 0;
#endif
@@ -76,7 +76,7 @@ public:
delete mockStreamsControl;
delete mockNetworkControl;
delete rendererControl;
#if defined(QT_MULTIMEDIAKIT_MOCK_WIDGETS)
#if defined(QT_MULTIMEDIA_MOCK_WIDGETS)
delete windowControl;
#endif
}
@@ -91,7 +91,7 @@ public:
return rendererControl;
}
}
#if defined(QT_MULTIMEDIAKIT_MOCK_WIDGETS)
#if defined(QT_MULTIMEDIA_MOCK_WIDGETS)
if (qstrcmp(iid, QVideoWindowControl_iid) == 0) {
if (windowRef == 0) {
windowRef += 1;
@@ -109,7 +109,7 @@ public:
{
if (control == rendererControl)
rendererRef -= 1;
#if defined(QT_MULTIMEDIAKIT_MOCK_WIDGETS)
#if defined(QT_MULTIMEDIA_MOCK_WIDGETS)
if (control == windowControl)
windowRef -= 1;
#endif
@@ -164,7 +164,7 @@ public:
MockStreamsControl *mockStreamsControl;
MockNetworkAccessControl *mockNetworkControl;
MockVideoRendererControl *rendererControl;
#if defined(QT_MULTIMEDIAKIT_MOCK_WIDGETS)
#if defined(QT_MULTIMEDIA_MOCK_WIDGETS)
MockVideoWindowControl *windowControl;
int windowRef;
#endif

6
tests/auto/qmultimedia_common/mockmediastreamscontrol.h
View File

@@ -55,9 +55,9 @@ public:
StreamType streamType(int index) { return _streams.at(index).type; }
void setStreamType(int index, StreamType type) { _streams[index].type = type; }
QVariant metaData(int index, QtMultimediaKit::MetaData key) {
QVariant metaData(int index, QtMultimedia::MetaData key) {
return _streams.at(index).metaData.value(key); }
void setMetaData(int index, QtMultimediaKit::MetaData key, const QVariant &value) {
void setMetaData(int index, QtMultimedia::MetaData key, const QVariant &value) {
_streams[index].metaData.insert(key, value); }
bool isActive(int index) { return _streams.at(index).active; }
@@ -68,7 +68,7 @@ private:
{
Stream() : type(UnknownStream), active(false) {}
StreamType type;
QMap<QtMultimediaKit::MetaData, QVariant> metaData;
QMap<QtMultimedia::MetaData, QVariant> metaData;
bool active;
};

6
tests/auto/qmultimedia_common/mockmetadatareadercontrol.h
View File

@@ -63,12 +63,12 @@ public:
if (m_available != available)
emit metaDataAvailableChanged(m_available = available);
}
QList<QtMultimediaKit::MetaData> availableMetaData() const
QList<QtMultimedia::MetaData> availableMetaData() const
{
return m_data.keys();
}
QVariant metaData(QtMultimediaKit::MetaData key) const
QVariant metaData(QtMultimedia::MetaData key) const
{
return m_data.value(key);
}
@@ -91,7 +91,7 @@ public:
}
bool m_available;
QMap<QtMultimediaKit::MetaData, QVariant> m_data;
QMap<QtMultimedia::MetaData, QVariant> m_data;
QMap<QString, QVariant> m_extendedData;
};

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;
};

4
tests/auto/qmultimedia_common/mockradiotunercontrol.h
View File

@@ -70,9 +70,9 @@ public:
{
return true;
}
QtMultimediaKit::AvailabilityError availabilityError() const
QtMultimedia::AvailabilityError availabilityError() const
{
return QtMultimediaKit::NoError;
return QtMultimedia::NoError;
}
QRadioTuner::Band band() const

4
tests/auto/qmultimedia_common/mockvideo.pri
View File

@@ -3,9 +3,9 @@ INCLUDEPATH += $$PWD \
../../../src/multimedia \
../../../src/multimedia/video
contains(QT,multimediakitwidgets)|contains(QT,multimediakitwidgets-private) {
contains(QT,multimediawidgets)|contains(QT,multimediawidgets-private) {
HEADERS *= ../qmultimedia_common/mockvideowindowcontrol.h
DEFINES *= QT_MULTIMEDIAKIT_MOCK_WIDGETS
DEFINES *= QT_MULTIMEDIA_MOCK_WIDGETS
}
HEADERS *= \

4
tests/auto/qmultimedia_common/mockvideowindowcontrol.h
View File

@@ -42,7 +42,7 @@
#ifndef MOCKVIDEOWINDOWCONTROL_H
#define MOCKVIDEOWINDOWCONTROL_H
#if defined(QT_MULTIMEDIAKIT_MOCK_WIDGETS)
#if defined(QT_MULTIMEDIA_MOCK_WIDGETS)
#include "qvideowindowcontrol.h"
@@ -70,5 +70,5 @@ public:
void setSaturation(int) {}
};
#endif // QT_MULTIMEDIAKIT_MOCK_WIDGETS
#endif // QT_MULTIMEDIA_MOCK_WIDGETS
#endif // MOCKVIDEOWINDOWCONTROL_H

2
tests/auto/qpaintervideosurface/qpaintervideosurface.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
contains(QT_CONFIG, opengl) | contains(QT_CONFIG, opengles2) {
QT += opengl

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

@@ -1,6 +1,6 @@
load(qttest_p4)
QT += multimediakit-private
QT += multimedia-private
CONFIG += no_private_qt_headers_warning
HEADERS += tst_qradiotuner.h

6
tests/auto/qradiotuner/tst_qradiotuner.cpp
View File

@@ -56,13 +56,13 @@ void tst_QRadioTuner::initTestCase()
radio = new QRadioTuner(0,provider);
QVERIFY(radio->service() != 0);
QVERIFY(radio->isAvailable());
QVERIFY(radio->availabilityError() == QtMultimediaKit::NoError);
QVERIFY(radio->availabilityError() == QtMultimedia::NoError);
QSignalSpy stateSpy(radio, SIGNAL(stateChanged(QRadioTuner::State)));
QCOMPARE(radio->state(), QRadioTuner::StoppedState);
radio->start();
QVERIFY(radio->availabilityError() == QtMultimediaKit::NoError);
QVERIFY(radio->availabilityError() == QtMultimedia::NoError);
QCOMPARE(radio->state(), QRadioTuner::ActiveState);
QCOMPARE(stateSpy.count(), 1);
@@ -77,7 +77,7 @@ void tst_QRadioTuner::cleanupTestCase()
QSignalSpy stateSpy(radio, SIGNAL(stateChanged(QRadioTuner::State)));
radio->stop();
QVERIFY(radio->availabilityError() == QtMultimediaKit::NoError);
QVERIFY(radio->availabilityError() == QtMultimedia::NoError);
QCOMPARE(radio->state(), QRadioTuner::StoppedState);
QCOMPARE(stateSpy.count(), 1);

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

@@ -1,6 +1,6 @@
load(qttest_p4)
QT += core declarative multimediakit-private
QT += core declarative multimedia-private
CONFIG += no_private_qt_headers_warning
# This is more of a system test

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

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

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

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

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

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

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

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

2
tests/auto/qvideowidget/qvideowidget.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
SOURCES += tst_qvideowidget.cpp

2
tests/auto/qvideowidget/tst_qvideowidget.cpp
View File

@@ -41,7 +41,7 @@
//TESTED_COMPONENT=src/multimedia
#include <qtmultimediakitdefs.h>
#include <qtmultimediadefs.h>
#include <QtTest/QtTest>
#include "qvideowidget.h"