diff options
Diffstat (limited to 'tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp')
-rw-r--r-- | tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp b/tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp index 7d231276b..8955e08fc 100644 --- a/tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp +++ b/tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp @@ -33,10 +33,10 @@ #include <qvideosink.h> #include <private/qplatformcamera_p.h> -#include <private/qplatformcameraimagecapture_p.h> +#include <private/qplatformimagecapture_p.h> #include <qcamera.h> #include <qcameradevice.h> -#include <qcameraimagecapture.h> +#include <qimagecapture.h> #include <qmediacapturesession.h> #include <qobject.h> #include <qmediadevices.h> @@ -211,26 +211,26 @@ void tst_QCamera::testSimpleCameraCapture() QMediaCaptureSession session; QCamera camera; - QCameraImageCapture imageCapture; + QImageCapture imageCapture; session.setCamera(&camera); session.setImageCapture(&imageCapture); QVERIFY(!imageCapture.isReadyForCapture()); QVERIFY(imageCapture.isAvailable()); - QCOMPARE(imageCapture.error(), QCameraImageCapture::NoError); + QCOMPARE(imageCapture.error(), QImageCapture::NoError); QVERIFY(imageCapture.errorString().isEmpty()); - QSignalSpy errorSignal(&imageCapture, SIGNAL(errorOccurred(int,QCameraImageCapture::Error,QString))); + QSignalSpy errorSignal(&imageCapture, SIGNAL(errorOccurred(int,QImageCapture::Error,QString))); imageCapture.captureToFile(QString::fromLatin1("/dev/null")); QCOMPARE(errorSignal.size(), 1); - QCOMPARE(imageCapture.error(), QCameraImageCapture::NotReadyError); + QCOMPARE(imageCapture.error(), QImageCapture::NotReadyError); QVERIFY(!imageCapture.errorString().isEmpty()); camera.start(); imageCapture.captureToFile(QString::fromLatin1("/dev/null")); QCOMPARE(errorSignal.size(), 1); - QCOMPARE(imageCapture.error(), QCameraImageCapture::NoError); + QCOMPARE(imageCapture.error(), QImageCapture::NoError); QVERIFY(imageCapture.errorString().isEmpty()); } @@ -238,19 +238,19 @@ void tst_QCamera::testCameraCapture() { QMediaCaptureSession session; QCamera camera; - QCameraImageCapture imageCapture; + QImageCapture imageCapture; session.setCamera(&camera); session.setImageCapture(&imageCapture); QVERIFY(!imageCapture.isReadyForCapture()); QSignalSpy capturedSignal(&imageCapture, SIGNAL(imageCaptured(int,QImage))); - QSignalSpy errorSignal(&imageCapture, SIGNAL(errorOccurred(int,QCameraImageCapture::Error,QString))); + QSignalSpy errorSignal(&imageCapture, SIGNAL(errorOccurred(int,QImageCapture::Error,QString))); imageCapture.captureToFile(QString::fromLatin1("/dev/null")); QCOMPARE(capturedSignal.size(), 0); QCOMPARE(errorSignal.size(), 1); - QCOMPARE(imageCapture.error(), QCameraImageCapture::NotReadyError); + QCOMPARE(imageCapture.error(), QImageCapture::NotReadyError); errorSignal.clear(); @@ -262,14 +262,14 @@ void tst_QCamera::testCameraCapture() QTRY_COMPARE(capturedSignal.size(), 1); QCOMPARE(errorSignal.size(), 0); - QCOMPARE(imageCapture.error(), QCameraImageCapture::NoError); + QCOMPARE(imageCapture.error(), QImageCapture::NoError); } void tst_QCamera::testCameraCaptureMetadata() { QMediaCaptureSession session; QCamera camera; - QCameraImageCapture imageCapture; + QImageCapture imageCapture; session.setCamera(&camera); session.setImageCapture(&imageCapture); @@ -440,7 +440,7 @@ void tst_QCamera::testCameraEncodingProperyChange() { QMediaCaptureSession session; QCamera camera; - QCameraImageCapture imageCapture; + QImageCapture imageCapture; session.setCamera(&camera); session.setImageCapture(&imageCapture); |