diff options
Diffstat (limited to 'tests/auto/unit/qmultimedia_common')
-rw-r--r-- | tests/auto/unit/qmultimedia_common/mockcameraexposurecontrol.h | 21 | ||||
-rw-r--r-- | tests/auto/unit/qmultimedia_common/mockmediaplaylistcontrol.h | 3 |
2 files changed, 17 insertions, 7 deletions
diff --git a/tests/auto/unit/qmultimedia_common/mockcameraexposurecontrol.h b/tests/auto/unit/qmultimedia_common/mockcameraexposurecontrol.h index 017615aa9..1b2372cf5 100644 --- a/tests/auto/unit/qmultimedia_common/mockcameraexposurecontrol.h +++ b/tests/auto/unit/qmultimedia_common/mockcameraexposurecontrol.h @@ -51,13 +51,22 @@ public: m_shutterRanges << 0.001 << 0.01 << 0.1 << 1.0; m_exposureRanges << -2.0 << 2.0; - QList<QCameraExposure::ExposureMode> exposureModes; - exposureModes << QCameraExposure::ExposureAuto << QCameraExposure::ExposureManual << QCameraExposure::ExposureBacklight - << QCameraExposure::ExposureNight << QCameraExposure::ExposureSpotlight << QCameraExposure::ExposureSports - << QCameraExposure::ExposureSnow << QCameraExposure:: ExposureLargeAperture << QCameraExposure::ExposureSmallAperture - << QCameraExposure::ExposurePortrait << QCameraExposure::ExposureModeVendor << QCameraExposure::ExposureBeach; + const QCameraExposure::ExposureMode exposureModes[] = { + QCameraExposure::ExposureAuto, + QCameraExposure::ExposureManual, + QCameraExposure::ExposureBacklight, + QCameraExposure::ExposureNight, + QCameraExposure::ExposureSpotlight, + QCameraExposure::ExposureSports, + QCameraExposure::ExposureSnow, + QCameraExposure:: ExposureLargeAperture, + QCameraExposure::ExposureSmallAperture, + QCameraExposure::ExposurePortrait, + QCameraExposure::ExposureModeVendor, + QCameraExposure::ExposureBeach, + }; - foreach (QCameraExposure::ExposureMode mode, exposureModes) + for (QCameraExposure::ExposureMode mode : exposureModes) m_exposureModes << QVariant::fromValue<QCameraExposure::ExposureMode>(mode); m_meteringModes << QVariant::fromValue<QCameraExposure::MeteringMode>(QCameraExposure::MeteringMatrix) diff --git a/tests/auto/unit/qmultimedia_common/mockmediaplaylistcontrol.h b/tests/auto/unit/qmultimedia_common/mockmediaplaylistcontrol.h index 229f70ea8..cc56e9adb 100644 --- a/tests/auto/unit/qmultimedia_common/mockmediaplaylistcontrol.h +++ b/tests/auto/unit/qmultimedia_common/mockmediaplaylistcontrol.h @@ -82,7 +82,8 @@ public: bool bMediaContentChanged = false; int i = 0; for (; i < playlistProvider()->mediaCount(); i++) { - if (playlistProvider()->media(i).canonicalUrl().toString() != newProvider->media(i).canonicalUrl().toString()) { + if (playlistProvider()->media(i).request().url().toString() + != newProvider->media(i).request().url().toString()) { bMediaContentChanged = true; break; } |