summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2020-12-23 11:49:42 +0100
committerLars Knoll <lars.knoll@qt.io>2021-01-21 19:56:31 +0000
commit4f7daef43da220869475d085ec2fb68083d53696 (patch)
tree12efb8a18fcd9d3cf43b1ca86581b868da746917 /tests
parenta9428fd087035e2f80c8f1230917d12b3d20be4c (diff)
Get rid of the old viewfindersettings backend interface
Change-Id: Id7b82b445ac528a30dd67ead01ffa73af298d3d3 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Doris Verria <doris.verria@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/unit/qmultimedia_common/mockcameraservice.h2
-rw-r--r--tests/auto/unit/qmultimedia_common/mockcameraviewfindersettingscontrol.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/unit/qmultimedia_common/mockcameraservice.h b/tests/auto/unit/qmultimedia_common/mockcameraservice.h
index 9d76715be..5d680a45c 100644
--- a/tests/auto/unit/qmultimedia_common/mockcameraservice.h
+++ b/tests/auto/unit/qmultimedia_common/mockcameraservice.h
@@ -135,7 +135,7 @@ public:
}
}
- if (qstrcmp(iid, QCameraViewfinderSettingsControl2_iid) == 0) {
+ if (qstrcmp(iid, QCameraViewfinderSettingsControl_iid) == 0) {
return mockViewfinderSettingsControl;
}
diff --git a/tests/auto/unit/qmultimedia_common/mockcameraviewfindersettingscontrol.h b/tests/auto/unit/qmultimedia_common/mockcameraviewfindersettingscontrol.h
index 88b717ed1..de334eb55 100644
--- a/tests/auto/unit/qmultimedia_common/mockcameraviewfindersettingscontrol.h
+++ b/tests/auto/unit/qmultimedia_common/mockcameraviewfindersettingscontrol.h
@@ -31,12 +31,12 @@
#include "qcameraviewfindersettingscontrol.h"
-class MockCameraViewfinderSettingsControl : public QCameraViewfinderSettingsControl2
+class MockCameraViewfinderSettingsControl : public QCameraViewfinderSettingsControl
{
Q_OBJECT
public:
MockCameraViewfinderSettingsControl(QObject *parent = 0):
- QCameraViewfinderSettingsControl2(parent)
+ QCameraViewfinderSettingsControl(parent)
{
QCameraViewfinderSettings s;
s.setResolution(640, 480);