diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-18 11:54:53 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-18 11:54:53 +0100 |
| commit | 432e929e644097b25060f85b1e089f2943577bc9 (patch) | |
| tree | 9a0cf5abcc77b85ee7aa88f875cb5dc097ab667c /tests/auto/unit/qcamera/tst_qcamera.cpp | |
| parent | 4ad0484b825524bcbb74145ac4e63bdd6274ce6a (diff) | |
| parent | 69837e6e04ae125186a8deaac59d82607fcd6d1a (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I21c230900111b4881b40c451bffc3d5c2101111b
Diffstat (limited to 'tests/auto/unit/qcamera/tst_qcamera.cpp')
| -rw-r--r-- | tests/auto/unit/qcamera/tst_qcamera.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/unit/qcamera/tst_qcamera.cpp b/tests/auto/unit/qcamera/tst_qcamera.cpp index 4b6202173..643b552f9 100644 --- a/tests/auto/unit/qcamera/tst_qcamera.cpp +++ b/tests/auto/unit/qcamera/tst_qcamera.cpp @@ -2039,7 +2039,7 @@ void tst_QCamera::testErrorSignal() QCamera camera; - QSignalSpy spyError(&camera, SIGNAL(error(QCamera::Error))); + QSignalSpy spyError(&camera, SIGNAL(errorOccurred(QCamera::Error))); /* Set the QCameraControl error and verify if the signal is emitted correctly in QCamera */ service.mockControl->setError(QCamera::CameraError,QString("Camera Error")); |