summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/integration/qaudioinput/BLACKLIST2
-rw-r--r--tests/auto/integration/qdeclarativevideooutput/qdeclarativevideooutput.pro2
-rw-r--r--tests/auto/integration/qdeclarativevideooutput_window/qdeclarativevideooutput_window.pro2
-rw-r--r--tests/auto/integration/qmediaplayerbackend/BLACKLIST6
-rw-r--r--tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp1
-rw-r--r--tests/auto/unit/qcamera/tst_qcamera.cpp20
-rw-r--r--tests/auto/unit/qmediaplayer/tst_qmediaplayer.cpp4
-rw-r--r--tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp40
-rw-r--r--tests/auto/unit/qvideosurfaceformat/tst_qvideosurfaceformat.cpp4
9 files changed, 41 insertions, 40 deletions
diff --git a/tests/auto/integration/qaudioinput/BLACKLIST b/tests/auto/integration/qaudioinput/BLACKLIST
index 994ea8f38..b7b86283b 100644
--- a/tests/auto/integration/qaudioinput/BLACKLIST
+++ b/tests/auto/integration/qaudioinput/BLACKLIST
@@ -5,5 +5,3 @@ linux
linux
[pullSuspendResume]
linux
-[push]
-linux
diff --git a/tests/auto/integration/qdeclarativevideooutput/qdeclarativevideooutput.pro b/tests/auto/integration/qdeclarativevideooutput/qdeclarativevideooutput.pro
index 1f3a00b42..c4221232a 100644
--- a/tests/auto/integration/qdeclarativevideooutput/qdeclarativevideooutput.pro
+++ b/tests/auto/integration/qdeclarativevideooutput/qdeclarativevideooutput.pro
@@ -1,6 +1,6 @@
TARGET = tst_qdeclarativevideooutput
-QT += multimedia-private qml testlib quick
+QT += multimedia-private qml testlib quick qtmultimediaquicktools-private
CONFIG += testcase
RESOURCES += qml.qrc
diff --git a/tests/auto/integration/qdeclarativevideooutput_window/qdeclarativevideooutput_window.pro b/tests/auto/integration/qdeclarativevideooutput_window/qdeclarativevideooutput_window.pro
index 82108d220..eeb1c0135 100644
--- a/tests/auto/integration/qdeclarativevideooutput_window/qdeclarativevideooutput_window.pro
+++ b/tests/auto/integration/qdeclarativevideooutput_window/qdeclarativevideooutput_window.pro
@@ -1,6 +1,6 @@
TARGET = tst_qdeclarativevideooutput_window
-QT += multimedia-private qml testlib quick
+QT += multimedia-private qml testlib quick qtmultimediaquicktools-private
CONFIG += testcase
RESOURCES += qml.qrc
diff --git a/tests/auto/integration/qmediaplayerbackend/BLACKLIST b/tests/auto/integration/qmediaplayerbackend/BLACKLIST
index c81f6c24f..c2833f1f7 100644
--- a/tests/auto/integration/qmediaplayerbackend/BLACKLIST
+++ b/tests/auto/integration/qmediaplayerbackend/BLACKLIST
@@ -1,8 +1,10 @@
# QTBUG-46368
osx
-windows
-
+windows-7
+windows-7sp1
+windows-10 msvc-2015
+windows-10 msvc-2017
# Media player plugin not built at the moment on this platform
opensuse-13.1 64bit
diff --git a/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp b/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp
index 25430a189..a776602a0 100644
--- a/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp
+++ b/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp
@@ -1348,6 +1348,7 @@ void tst_QMediaPlayerBackend::surfaceTest_data()
QList<QVideoFrame::PixelFormat> formatsYUV;
formatsYUV << QVideoFrame::Format_YUV420P
+ << QVideoFrame::Format_YUV422P
<< QVideoFrame::Format_YV12
<< QVideoFrame::Format_UYVY
<< QVideoFrame::Format_YUYV
diff --git a/tests/auto/unit/qcamera/tst_qcamera.cpp b/tests/auto/unit/qcamera/tst_qcamera.cpp
index fa5e7187b..4b6202173 100644
--- a/tests/auto/unit/qcamera/tst_qcamera.cpp
+++ b/tests/auto/unit/qcamera/tst_qcamera.cpp
@@ -794,16 +794,16 @@ void tst_QCamera::testImageSettings()
QVERIFY(!settings.isNull());
settings = QImageEncoderSettings();
- settings.setEncodingOption(QLatin1Literal("encoderOption"), QVariant(1));
- QCOMPARE(settings.encodingOption(QLatin1Literal("encoderOption")), QVariant(1));
+ settings.setEncodingOption(QLatin1String("encoderOption"), QVariant(1));
+ QCOMPARE(settings.encodingOption(QLatin1String("encoderOption")), QVariant(1));
QVariantMap options;
- options.insert(QLatin1Literal("encoderOption"), QVariant(1));
+ options.insert(QLatin1String("encoderOption"), QVariant(1));
QCOMPARE(settings.encodingOptions(), options);
- options.insert(QLatin1Literal("encoderOption2"), QVariant(2));
- options.remove(QLatin1Literal("encoderOption"));
+ options.insert(QLatin1String("encoderOption2"), QVariant(2));
+ options.remove(QLatin1String("encoderOption"));
settings.setEncodingOptions(options);
- QCOMPARE(settings.encodingOption(QLatin1Literal("encoderOption")), QVariant());
- QCOMPARE(settings.encodingOption(QLatin1Literal("encoderOption2")), QVariant(2));
+ QCOMPARE(settings.encodingOption(QLatin1String("encoderOption")), QVariant());
+ QCOMPARE(settings.encodingOption(QLatin1String("encoderOption2")), QVariant(2));
QVERIFY(!settings.isNull());
QVERIFY(settings != QImageEncoderSettings());
@@ -874,11 +874,11 @@ void tst_QCamera::testImageSettings()
QVERIFY(settings1 != settings2);
settings1 = QImageEncoderSettings();
- settings1.setEncodingOption(QLatin1Literal("encoderOption"), QVariant(1));
+ settings1.setEncodingOption(QLatin1String("encoderOption"), QVariant(1));
settings2 = QImageEncoderSettings();
- settings2.setEncodingOption(QLatin1Literal("encoderOption"), QVariant(1));
+ settings2.setEncodingOption(QLatin1String("encoderOption"), QVariant(1));
QVERIFY(settings1 == settings2);
- settings2.setEncodingOption(QLatin1Literal("encoderOption"), QVariant(2));
+ settings2.setEncodingOption(QLatin1String("encoderOption"), QVariant(2));
QVERIFY(settings1 != settings2);
}
diff --git a/tests/auto/unit/qmediaplayer/tst_qmediaplayer.cpp b/tests/auto/unit/qmediaplayer/tst_qmediaplayer.cpp
index 94d297ad0..871ff3cc7 100644
--- a/tests/auto/unit/qmediaplayer/tst_qmediaplayer.cpp
+++ b/tests/auto/unit/qmediaplayer/tst_qmediaplayer.cpp
@@ -1329,7 +1329,7 @@ void tst_QMediaPlayer::testAudioRole()
spy.clear();
- player.setProperty("audioRole", qVariantFromValue(QAudio::AlarmRole));
+ player.setProperty("audioRole", QVariant::fromValue(QAudio::AlarmRole));
QCOMPARE(qvariant_cast<QAudio::Role>(player.property("audioRole")), QAudio::AlarmRole);
QCOMPARE(mockService->mockAudioRoleControl->audioRole(), QAudio::AlarmRole);
QCOMPARE(spy.count(), 1);
@@ -1397,7 +1397,7 @@ void tst_QMediaPlayer::testCustomAudioRole()
spyCustomRole.clear();
QString customRole2(QStringLiteral("customRole2"));
- player.setProperty("customAudioRole", qVariantFromValue(customRole2));
+ player.setProperty("customAudioRole", QVariant::fromValue(customRole2));
QCOMPARE(qvariant_cast<QString>(player.property("customAudioRole")), customRole2);
QCOMPARE(mockService->mockCustomAudioRoleControl->customAudioRole(), customRole2);
QCOMPARE(spyRole.count(), 0);
diff --git a/tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp b/tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp
index 2bcf2011d..944207dfe 100644
--- a/tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp
+++ b/tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp
@@ -512,16 +512,16 @@ void tst_QMediaRecorder::testAudioSettings()
QVERIFY(!settings.isNull());
settings = QAudioEncoderSettings();
- settings.setEncodingOption(QLatin1Literal("encoderOption"), QVariant(1));
- QCOMPARE(settings.encodingOption(QLatin1Literal("encoderOption")), QVariant(1));
+ settings.setEncodingOption(QLatin1String("encoderOption"), QVariant(1));
+ QCOMPARE(settings.encodingOption(QLatin1String("encoderOption")), QVariant(1));
QVariantMap options;
- options.insert(QLatin1Literal("encoderOption"), QVariant(1));
+ options.insert(QLatin1String("encoderOption"), QVariant(1));
QCOMPARE(settings.encodingOptions(), options);
- options.insert(QLatin1Literal("encoderOption2"), QVariant(2));
- options.remove(QLatin1Literal("encoderOption"));
+ options.insert(QLatin1String("encoderOption2"), QVariant(2));
+ options.remove(QLatin1String("encoderOption"));
settings.setEncodingOptions(options);
- QCOMPARE(settings.encodingOption(QLatin1Literal("encoderOption")), QVariant());
- QCOMPARE(settings.encodingOption(QLatin1Literal("encoderOption2")), QVariant(2));
+ QCOMPARE(settings.encodingOption(QLatin1String("encoderOption")), QVariant());
+ QCOMPARE(settings.encodingOption(QLatin1String("encoderOption2")), QVariant(2));
QVERIFY(!settings.isNull());
QVERIFY(settings != QAudioEncoderSettings());
@@ -614,11 +614,11 @@ void tst_QMediaRecorder::testAudioSettings()
QVERIFY(settings1 != settings2);
settings1 = QAudioEncoderSettings();
- settings1.setEncodingOption(QLatin1Literal("encoderOption"), QVariant(1));
+ settings1.setEncodingOption(QLatin1String("encoderOption"), QVariant(1));
settings2 = QAudioEncoderSettings();
- settings2.setEncodingOption(QLatin1Literal("encoderOption"), QVariant(1));
+ settings2.setEncodingOption(QLatin1String("encoderOption"), QVariant(1));
QVERIFY(settings1 == settings2);
- settings2.setEncodingOption(QLatin1Literal("encoderOption"), QVariant(2));
+ settings2.setEncodingOption(QLatin1String("encoderOption"), QVariant(2));
QVERIFY(settings1 != settings2);
}
@@ -663,16 +663,16 @@ void tst_QMediaRecorder::testVideoSettings()
QVERIFY(!settings.isNull());
settings = QVideoEncoderSettings();
- settings.setEncodingOption(QLatin1Literal("encoderOption"), QVariant(1));
- QCOMPARE(settings.encodingOption(QLatin1Literal("encoderOption")), QVariant(1));
+ settings.setEncodingOption(QLatin1String("encoderOption"), QVariant(1));
+ QCOMPARE(settings.encodingOption(QLatin1String("encoderOption")), QVariant(1));
QVariantMap options;
- options.insert(QLatin1Literal("encoderOption"), QVariant(1));
+ options.insert(QLatin1String("encoderOption"), QVariant(1));
QCOMPARE(settings.encodingOptions(), options);
- options.insert(QLatin1Literal("encoderOption2"), QVariant(2));
- options.remove(QLatin1Literal("encoderOption"));
+ options.insert(QLatin1String("encoderOption2"), QVariant(2));
+ options.remove(QLatin1String("encoderOption"));
settings.setEncodingOptions(options);
- QCOMPARE(settings.encodingOption(QLatin1Literal("encoderOption")), QVariant());
- QCOMPARE(settings.encodingOption(QLatin1Literal("encoderOption2")), QVariant(2));
+ QCOMPARE(settings.encodingOption(QLatin1String("encoderOption")), QVariant());
+ QCOMPARE(settings.encodingOption(QLatin1String("encoderOption2")), QVariant(2));
QVERIFY(!settings.isNull());
QVERIFY(settings != QVideoEncoderSettings());
@@ -766,11 +766,11 @@ void tst_QMediaRecorder::testVideoSettings()
QVERIFY(settings1 != settings2);
settings1 = QVideoEncoderSettings();
- settings1.setEncodingOption(QLatin1Literal("encoderOption"), QVariant(1));
+ settings1.setEncodingOption(QLatin1String("encoderOption"), QVariant(1));
settings2 = QVideoEncoderSettings();
- settings2.setEncodingOption(QLatin1Literal("encoderOption"), QVariant(1));
+ settings2.setEncodingOption(QLatin1String("encoderOption"), QVariant(1));
QVERIFY(settings1 == settings2);
- settings2.setEncodingOption(QLatin1Literal("encoderOption"), QVariant(2));
+ settings2.setEncodingOption(QLatin1String("encoderOption"), QVariant(2));
QVERIFY(settings1 != settings2);
}
diff --git a/tests/auto/unit/qvideosurfaceformat/tst_qvideosurfaceformat.cpp b/tests/auto/unit/qvideosurfaceformat/tst_qvideosurfaceformat.cpp
index 5412a838d..4fa754a45 100644
--- a/tests/auto/unit/qvideosurfaceformat/tst_qvideosurfaceformat.cpp
+++ b/tests/auto/unit/qvideosurfaceformat/tst_qvideosurfaceformat.cpp
@@ -321,7 +321,7 @@ void tst_QVideoSurfaceFormat::scanLineDirection()
{
QVideoSurfaceFormat format(QSize(16, 16), QVideoFrame::Format_RGB32);
- format.setProperty("scanLineDirection", qVariantFromValue(direction));
+ format.setProperty("scanLineDirection", QVariant::fromValue(direction));
QCOMPARE(format.scanLineDirection(), direction);
QCOMPARE(
@@ -363,7 +363,7 @@ void tst_QVideoSurfaceFormat::yCbCrColorSpaceEnum()
}
{
QVideoSurfaceFormat format(QSize(64, 64), QVideoFrame::Format_RGB32);
- format.setProperty("yCbCrColorSpace", qVariantFromValue(colorspace));
+ format.setProperty("yCbCrColorSpace", QVariant::fromValue(colorspace));
QCOMPARE(format.yCbCrColorSpace(), colorspace);
QCOMPARE(qvariant_cast<QVideoSurfaceFormat::YCbCrColorSpace>(format.property("yCbCrColorSpace")),
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 11:04:01 +0000