diff options
Diffstat (limited to 'tests/auto/qcameraimagecapture/tst_qcameraimagecapture.cpp')
-rw-r--r-- | tests/auto/qcameraimagecapture/tst_qcameraimagecapture.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/qcameraimagecapture/tst_qcameraimagecapture.cpp b/tests/auto/qcameraimagecapture/tst_qcameraimagecapture.cpp index 312def45e..e842cbb83 100644 --- a/tests/auto/qcameraimagecapture/tst_qcameraimagecapture.cpp +++ b/tests/auto/qcameraimagecapture/tst_qcameraimagecapture.cpp @@ -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 |