summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp20
-rw-r--r--tests/auto/unit/mockbackend/qmockimagecapture.cpp8
-rw-r--r--tests/auto/unit/mockbackend/qmockimagecapture.h6
-rw-r--r--tests/auto/unit/mockbackend/qmockintegration.cpp2
-rw-r--r--tests/auto/unit/mockbackend/qmockintegration_p.h2
-rw-r--r--tests/auto/unit/mockbackend/qmockmediacapturesession.h6
-rw-r--r--tests/auto/unit/multimedia/CMakeLists.txt2
-rw-r--r--tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp26
-rw-r--r--tests/auto/unit/multimedia/qimagecapture/CMakeLists.txt (renamed from tests/auto/unit/multimedia/qcameraimagecapture/CMakeLists.txt)8
-rw-r--r--tests/auto/unit/multimedia/qimagecapture/tst_qimagecapture.cpp (renamed from tests/auto/unit/multimedia/qcameraimagecapture/tst_qcameraimagecapture.cpp)88
-rw-r--r--tests/auto/unit/multimediawidgets/qcamerawidgets/tst_qcamerawidgets.cpp6
11 files changed, 87 insertions, 87 deletions
diff --git a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp
index 7bcc0dc72..a656c1da0 100644
--- a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp
+++ b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp
@@ -33,10 +33,10 @@
#include <QDebug>
#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>
@@ -158,7 +158,7 @@ void tst_QCameraBackend::testCameraStates()
QMediaCaptureSession session;
QCamera camera;
camera.setCameraDevice(QCameraDevice());
- QCameraImageCapture imageCapture;
+ QImageCapture imageCapture;
session.setCamera(&camera);
session.setImageCapture(&imageCapture);
@@ -218,7 +218,7 @@ void tst_QCameraBackend::testCameraCapture()
{
QMediaCaptureSession session;
QCamera camera;
- QCameraImageCapture imageCapture;
+ QImageCapture imageCapture;
session.setCamera(&camera);
session.setImageCapture(&imageCapture);
@@ -229,11 +229,11 @@ void tst_QCameraBackend::testCameraCapture()
QSignalSpy capturedSignal(&imageCapture, SIGNAL(imageCaptured(int,QImage)));
QSignalSpy savedSignal(&imageCapture, SIGNAL(imageSaved(int,QString)));
- QSignalSpy errorSignal(&imageCapture, SIGNAL(errorOccurred(int,QCameraImageCapture::Error,const QString&)));
+ QSignalSpy errorSignal(&imageCapture, SIGNAL(errorOccurred(int,QImageCapture::Error,const QString&)));
imageCapture.captureToFile();
QTRY_COMPARE(errorSignal.size(), 1);
- QCOMPARE(imageCapture.error(), QCameraImageCapture::NotReadyError);
+ QCOMPARE(imageCapture.error(), QImageCapture::NotReadyError);
QCOMPARE(capturedSignal.size(), 0);
errorSignal.clear();
@@ -253,7 +253,7 @@ void tst_QCameraBackend::testCameraCapture()
QTRY_COMPARE(capturedSignal.size(), 1);
QCOMPARE(capturedSignal.last().first().toInt(), id);
QCOMPARE(errorSignal.size(), 0);
- QCOMPARE(imageCapture.error(), QCameraImageCapture::NoError);
+ QCOMPARE(imageCapture.error(), QImageCapture::NoError);
QCOMPARE(savedSignal.last().first().toInt(), id);
QString location = savedSignal.last().last().toString();
@@ -274,7 +274,7 @@ void tst_QCameraBackend::testCaptureToBuffer()
QMediaCaptureSession session;
QCamera camera;
- QCameraImageCapture imageCapture;
+ QImageCapture imageCapture;
session.setCamera(&camera);
session.setImageCapture(&imageCapture);
@@ -287,7 +287,7 @@ void tst_QCameraBackend::testCaptureToBuffer()
QSignalSpy capturedSignal(&imageCapture, SIGNAL(imageCaptured(int,QImage)));
QSignalSpy imageAvailableSignal(&imageCapture, SIGNAL(imageAvailable(int,QVideoFrame)));
QSignalSpy savedSignal(&imageCapture, SIGNAL(imageSaved(int,QString)));
- QSignalSpy errorSignal(&imageCapture, SIGNAL(errorOccurred(int,QCameraImageCapture::Error,const QString&)));
+ QSignalSpy errorSignal(&imageCapture, SIGNAL(errorOccurred(int,QImageCapture::Error,const QString&)));
camera.start();
QTRY_VERIFY(imageCapture.isReadyForCapture());
@@ -323,7 +323,7 @@ void tst_QCameraBackend::testCameraCaptureMetadata()
QMediaCaptureSession session;
QCamera camera;
- QCameraImageCapture imageCapture;
+ QImageCapture imageCapture;
session.setCamera(&camera);
session.setImageCapture(&imageCapture);
diff --git a/tests/auto/unit/mockbackend/qmockimagecapture.cpp b/tests/auto/unit/mockbackend/qmockimagecapture.cpp
index 23e9fad60..9e2396113 100644
--- a/tests/auto/unit/mockbackend/qmockimagecapture.cpp
+++ b/tests/auto/unit/mockbackend/qmockimagecapture.cpp
@@ -29,11 +29,11 @@
#include <qmockimagecapture.h>
#include <qmockcamera.h>
#include <qmockmediacapturesession.h>
-#include <qcameraimagecapture.h>
+#include <qimagecapture.h>
#include <qcamera.h>
-QMockImageCapture::QMockImageCapture(QCameraImageCapture *parent)
- : QPlatformCameraImageCapture(parent)
+QMockImageCapture::QMockImageCapture(QImageCapture *parent)
+ : QPlatformImageCapture(parent)
{
}
@@ -51,7 +51,7 @@ int QMockImageCapture::capture(const QString &fileName)
QTimer::singleShot(5, this, SLOT(captured()));
return m_captureRequest;
} else {
- emit error(-1, QCameraImageCapture::NotReadyError,
+ emit error(-1, QImageCapture::NotReadyError,
QLatin1String("Could not capture in stopped state"));
}
diff --git a/tests/auto/unit/mockbackend/qmockimagecapture.h b/tests/auto/unit/mockbackend/qmockimagecapture.h
index 139c12474..8d7cea1a4 100644
--- a/tests/auto/unit/mockbackend/qmockimagecapture.h
+++ b/tests/auto/unit/mockbackend/qmockimagecapture.h
@@ -33,18 +33,18 @@
#include <QTimer>
#include <QtMultimedia/qmediametadata.h>
-#include "private/qplatformcameraimagecapture_p.h"
+#include "private/qplatformimagecapture_p.h"
#include "private/qplatformcamera_p.h"
QT_BEGIN_NAMESPACE
class QMockMediaCaptureSession;
-class QMockImageCapture : public QPlatformCameraImageCapture
+class QMockImageCapture : public QPlatformImageCapture
{
Q_OBJECT
public:
- QMockImageCapture(QCameraImageCapture *parent);
+ QMockImageCapture(QImageCapture *parent);
~QMockImageCapture()
{
diff --git a/tests/auto/unit/mockbackend/qmockintegration.cpp b/tests/auto/unit/mockbackend/qmockintegration.cpp
index 614542042..16e65a7b8 100644
--- a/tests/auto/unit/mockbackend/qmockintegration.cpp
+++ b/tests/auto/unit/mockbackend/qmockintegration.cpp
@@ -94,7 +94,7 @@ QPlatformCamera *QMockIntegration::createCamera(QCamera *parent)
return m_lastCamera;
}
-QPlatformCameraImageCapture *QMockIntegration::createImageCapture(QCameraImageCapture *capture)
+QPlatformImageCapture *QMockIntegration::createImageCapture(QImageCapture *capture)
{
return new QMockImageCapture(capture);
}
diff --git a/tests/auto/unit/mockbackend/qmockintegration_p.h b/tests/auto/unit/mockbackend/qmockintegration_p.h
index e46b35713..7c32d7783 100644
--- a/tests/auto/unit/mockbackend/qmockintegration_p.h
+++ b/tests/auto/unit/mockbackend/qmockintegration_p.h
@@ -75,7 +75,7 @@ public:
QPlatformMediaPlayer *createPlayer(QMediaPlayer *) override;
QPlatformCamera *createCamera(QCamera *) override;
QPlatformMediaEncoder *createEncoder(QMediaRecorder *) override;
- QPlatformCameraImageCapture *createImageCapture(QCameraImageCapture *) override;
+ QPlatformImageCapture *createImageCapture(QImageCapture *) override;
QPlatformMediaCaptureSession *createCaptureSession() override;
QPlatformVideoSink *createVideoSink(QVideoSink *) override;
diff --git a/tests/auto/unit/mockbackend/qmockmediacapturesession.h b/tests/auto/unit/mockbackend/qmockmediacapturesession.h
index 8ddbeefcd..1d18c664b 100644
--- a/tests/auto/unit/mockbackend/qmockmediacapturesession.h
+++ b/tests/auto/unit/mockbackend/qmockmediacapturesession.h
@@ -60,11 +60,11 @@ public:
mockCameraControl = control;
}
- void setImageCapture(QPlatformCameraImageCapture *imageCapture) override
+ void setImageCapture(QPlatformImageCapture *imageCapture) override
{
mockImageCapture = imageCapture;
}
- QPlatformCameraImageCapture *imageCapture() override { return hasControls ? mockImageCapture : nullptr; }
+ QPlatformImageCapture *imageCapture() override { return hasControls ? mockImageCapture : nullptr; }
QPlatformMediaEncoder *mediaEncoder() override { return hasControls ? mockControl : nullptr; }
void setMediaEncoder(QPlatformMediaEncoder *encoder) override
@@ -88,7 +88,7 @@ public:
}
QMockCamera *mockCameraControl = nullptr;
- QPlatformCameraImageCapture *mockImageCapture = nullptr;
+ QPlatformImageCapture *mockImageCapture = nullptr;
QMockMediaEncoder *mockControl = nullptr;
QPlatformAudioInput *m_audioInput = nullptr;
bool hasControls;
diff --git a/tests/auto/unit/multimedia/CMakeLists.txt b/tests/auto/unit/multimedia/CMakeLists.txt
index d90d15903..46e48ca6c 100644
--- a/tests/auto/unit/multimedia/CMakeLists.txt
+++ b/tests/auto/unit/multimedia/CMakeLists.txt
@@ -6,7 +6,7 @@ add_subdirectory(qaudioformat)
add_subdirectory(qaudionamespace)
add_subdirectory(qcamera)
add_subdirectory(qcameradevice)
-add_subdirectory(qcameraimagecapture)
+add_subdirectory(qimagecapture)
add_subdirectory(qmediaformat)
add_subdirectory(qmediaplayer)
add_subdirectory(qmediaplaylist)
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);
diff --git a/tests/auto/unit/multimedia/qcameraimagecapture/CMakeLists.txt b/tests/auto/unit/multimedia/qimagecapture/CMakeLists.txt
index 11b5c643a..11a2c79bc 100644
--- a/tests/auto/unit/multimedia/qcameraimagecapture/CMakeLists.txt
+++ b/tests/auto/unit/multimedia/qimagecapture/CMakeLists.txt
@@ -1,12 +1,12 @@
-# Generated from qcameraimagecapture.pro.
+# Generated from qimagecapture.pro.
#####################################################################
-## tst_qcameraimagecapture Test:
+## tst_qimagecapture Test:
#####################################################################
-qt_internal_add_test(tst_qcameraimagecapture
+qt_internal_add_test(tst_qimagecapture
SOURCES
- tst_qcameraimagecapture.cpp
+ tst_qimagecapture.cpp
INCLUDE_DIRECTORIES
../../mockbackend
PUBLIC_LIBRARIES
diff --git a/tests/auto/unit/multimedia/qcameraimagecapture/tst_qcameraimagecapture.cpp b/tests/auto/unit/multimedia/qimagecapture/tst_qimagecapture.cpp
index c69af0621..b81f989db 100644
--- a/tests/auto/unit/multimedia/qcameraimagecapture/tst_qcameraimagecapture.cpp
+++ b/tests/auto/unit/multimedia/qimagecapture/tst_qimagecapture.cpp
@@ -30,9 +30,9 @@
#include <QDebug>
#include <private/qplatformcamera_p.h>
-#include <private/qplatformcameraimagecapture_p.h>
+#include <private/qplatformimagecapture_p.h>
#include <qcamera.h>
-#include <qcameraimagecapture.h>
+#include <qimagecapture.h>
#include <qmediacapturesession.h>
#include "qmockmediacapturesession.h"
@@ -40,7 +40,7 @@
QT_USE_NAMESPACE
-class tst_QCameraImageCapture: public QObject
+class tst_QImageCapture: public QObject
{
Q_OBJECT
@@ -68,40 +68,40 @@ private:
QMockIntegration *mockIntegration;
};
-void tst_QCameraImageCapture::initTestCase()
+void tst_QImageCapture::initTestCase()
{
mockIntegration = new QMockIntegration;
}
-void tst_QCameraImageCapture::init()
+void tst_QImageCapture::init()
{
}
-void tst_QCameraImageCapture::cleanup()
+void tst_QImageCapture::cleanup()
{
}
-void tst_QCameraImageCapture::cleanupTestCase()
+void tst_QImageCapture::cleanupTestCase()
{
delete mockIntegration;
}
-void tst_QCameraImageCapture::constructor()
+void tst_QImageCapture::constructor()
{
QMediaCaptureSession session;
QCamera camera;
- QCameraImageCapture imageCapture;
+ QImageCapture imageCapture;
session.setCamera(&camera);
session.setImageCapture(&imageCapture);
QVERIFY(imageCapture.isAvailable() == true);
}
-void tst_QCameraImageCapture::isAvailable()
+void tst_QImageCapture::isAvailable()
{
{
QMediaCaptureSession session;
- QCameraImageCapture imageCapture;
+ QImageCapture imageCapture;
session.setImageCapture(&imageCapture);
QVERIFY(!imageCapture.isAvailable());
@@ -110,7 +110,7 @@ void tst_QCameraImageCapture::isAvailable()
{
QMediaCaptureSession session;
QCamera camera;
- QCameraImageCapture imageCapture;
+ QImageCapture imageCapture;
session.setCamera(&camera);
session.setImageCapture(&imageCapture);
@@ -118,11 +118,11 @@ void tst_QCameraImageCapture::isAvailable()
}
}
-void tst_QCameraImageCapture::deleteMediaSource()
+void tst_QImageCapture::deleteMediaSource()
{
QMediaCaptureSession session;
QCamera *camera = new QCamera;
- QCameraImageCapture *capture = new QCameraImageCapture;
+ QImageCapture *capture = new QImageCapture;
session.setCamera(camera);
session.setImageCapture(capture);
@@ -137,11 +137,11 @@ void tst_QCameraImageCapture::deleteMediaSource()
delete capture;
}
-void tst_QCameraImageCapture::isReadyForCapture()
+void tst_QImageCapture::isReadyForCapture()
{
QMediaCaptureSession session;
QCamera camera;
- QCameraImageCapture imageCapture;
+ QImageCapture imageCapture;
session.setCamera(&camera);
session.setImageCapture(&imageCapture);
@@ -154,11 +154,11 @@ void tst_QCameraImageCapture::isReadyForCapture()
camera.stop();
}
-void tst_QCameraImageCapture::capture()
+void tst_QImageCapture::capture()
{
QMediaCaptureSession session;
QCamera camera;
- QCameraImageCapture imageCapture;
+ QImageCapture imageCapture;
session.setCamera(&camera);
session.setImageCapture(&imageCapture);
@@ -172,77 +172,77 @@ void tst_QCameraImageCapture::capture()
camera.stop();
}
-void tst_QCameraImageCapture::encodingSettings()
+void tst_QImageCapture::encodingSettings()
{
QMediaCaptureSession session;
QCamera camera;
- QCameraImageCapture imageCapture;
+ QImageCapture imageCapture;
session.setCamera(&camera);
session.setImageCapture(&imageCapture);
QVERIFY(imageCapture.isAvailable() == true);
- imageCapture.setFileFormat(QCameraImageCapture::JPEG);
- imageCapture.setQuality(QCameraImageCapture::NormalQuality);
- QVERIFY(imageCapture.fileFormat() == QCameraImageCapture::JPEG);
- QVERIFY(imageCapture.quality() == QCameraImageCapture::NormalQuality);
+ imageCapture.setFileFormat(QImageCapture::JPEG);
+ imageCapture.setQuality(QImageCapture::NormalQuality);
+ QVERIFY(imageCapture.fileFormat() == QImageCapture::JPEG);
+ QVERIFY(imageCapture.quality() == QImageCapture::NormalQuality);
}
-void tst_QCameraImageCapture::errors()
+void tst_QImageCapture::errors()
{
QMockCamera::Simple simple;
{
QMediaCaptureSession session;
QCamera camera;
- QCameraImageCapture imageCapture;
+ QImageCapture imageCapture;
session.setCamera(&camera);
session.setImageCapture(&imageCapture);
QVERIFY(imageCapture.isAvailable() == true);
imageCapture.captureToFile(QString::fromLatin1("/dev/null"));
- QCOMPARE(imageCapture.error(), QCameraImageCapture::NotReadyError);
+ QCOMPARE(imageCapture.error(), QImageCapture::NotReadyError);
QVERIFY(!imageCapture.errorString().isEmpty());
}
QMediaCaptureSession session;
QCamera camera;
- QCameraImageCapture imageCapture;
+ QImageCapture imageCapture;
session.setCamera(&camera);
session.setImageCapture(&imageCapture);
camera.start();
QVERIFY(imageCapture.isAvailable() == true);
- QVERIFY(imageCapture.error() == QCameraImageCapture::NoError);
+ QVERIFY(imageCapture.error() == QImageCapture::NoError);
QVERIFY(imageCapture.errorString().isEmpty());
imageCapture.captureToFile();
- QVERIFY(imageCapture.error() == QCameraImageCapture::NoError);
+ QVERIFY(imageCapture.error() == QImageCapture::NoError);
QVERIFY(imageCapture.errorString().isEmpty());
}
-void tst_QCameraImageCapture::error()
+void tst_QImageCapture::error()
{
QMediaCaptureSession session;
QCamera camera;
- QCameraImageCapture imageCapture;
+ QImageCapture imageCapture;
session.setCamera(&camera);
session.setImageCapture(&imageCapture);
- QSignalSpy spy(&imageCapture, SIGNAL(errorOccurred(int,QCameraImageCapture::Error,QString)));
+ QSignalSpy spy(&imageCapture, SIGNAL(errorOccurred(int,QImageCapture::Error,QString)));
imageCapture.captureToFile();
QTest::qWait(30);
QVERIFY(spy.count() == 1);
QVERIFY(qvariant_cast<int>(spy.at(0).at(0)) == -1);
- QVERIFY(qvariant_cast<QCameraImageCapture::Error>(spy.at(0).at(1)) == QCameraImageCapture::NotReadyError);
+ QVERIFY(qvariant_cast<QImageCapture::Error>(spy.at(0).at(1)) == QImageCapture::NotReadyError);
QVERIFY(qvariant_cast<QString>(spy.at(0).at(2)) == "Could not capture in stopped state");
spy.clear();
}
-void tst_QCameraImageCapture::imageCaptured()
+void tst_QImageCapture::imageCaptured()
{
QMediaCaptureSession session;
QCamera camera;
- QCameraImageCapture imageCapture;
+ QImageCapture imageCapture;
session.setCamera(&camera);
session.setImageCapture(&imageCapture);
@@ -261,11 +261,11 @@ void tst_QCameraImageCapture::imageCaptured()
camera.stop();
}
-void tst_QCameraImageCapture::imageExposed()
+void tst_QImageCapture::imageExposed()
{
QMediaCaptureSession session;
QCamera camera;
- QCameraImageCapture imageCapture;
+ QImageCapture imageCapture;
session.setCamera(&camera);
session.setImageCapture(&imageCapture);
@@ -282,11 +282,11 @@ void tst_QCameraImageCapture::imageExposed()
camera.stop();
}
-void tst_QCameraImageCapture::imageSaved()
+void tst_QImageCapture::imageSaved()
{
QMediaCaptureSession session;
QCamera camera;
- QCameraImageCapture imageCapture;
+ QImageCapture imageCapture;
session.setCamera(&camera);
session.setImageCapture(&imageCapture);
@@ -304,11 +304,11 @@ void tst_QCameraImageCapture::imageSaved()
camera.stop();
}
-void tst_QCameraImageCapture::readyForCaptureChanged()
+void tst_QImageCapture::readyForCaptureChanged()
{
QMediaCaptureSession session;
QCamera camera;
- QCameraImageCapture imageCapture;
+ QImageCapture imageCapture;
session.setCamera(&camera);
session.setImageCapture(&imageCapture);
@@ -329,6 +329,6 @@ void tst_QCameraImageCapture::readyForCaptureChanged()
spy.clear();
}
-QTEST_MAIN(tst_QCameraImageCapture)
+QTEST_MAIN(tst_QImageCapture)
-#include "tst_qcameraimagecapture.moc"
+#include "tst_qimagecapture.moc"
diff --git a/tests/auto/unit/multimediawidgets/qcamerawidgets/tst_qcamerawidgets.cpp b/tests/auto/unit/multimediawidgets/qcamerawidgets/tst_qcamerawidgets.cpp
index 26facdd9a..7db456190 100644
--- a/tests/auto/unit/multimediawidgets/qcamerawidgets/tst_qcamerawidgets.cpp
+++ b/tests/auto/unit/multimediawidgets/qcamerawidgets/tst_qcamerawidgets.cpp
@@ -32,10 +32,10 @@
#include <QDebug>
#include <private/qplatformcamera_p.h>
-#include <private/qplatformcameraimagecapture_p.h>
+#include <private/qplatformimagecapture_p.h>
#include <qmediacapturesession.h>
#include <qcamera.h>
-#include <qcameraimagecapture.h>
+#include <qimagecapture.h>
#include <qgraphicsvideoitem.h>
#include <qobject.h>
#include <qvideowidget.h>
@@ -76,7 +76,7 @@ void tst_QCameraWidgets::testCameraEncodingProperyChange()
{
QMediaCaptureSession session;
QCamera camera;
- QCameraImageCapture imageCapture;
+ QImageCapture imageCapture;
session.setCamera(&camera);
session.setImageCapture(&imageCapture);
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-02 22:44:31 +0000