diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2021-01-04 09:31:49 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2021-01-21 19:56:38 +0000 |
| commit | f8f33da7964977e30f8d2a3439a9058ba21bc798 (patch) | |
| tree | d96edb4f609e491fd5933fa84b41ca58c1aca61e /src/imports | |
| parent | 4f7daef43da220869475d085ec2fb68083d53696 (diff) | |
Merge the viewfindersettingscontrol into QCameraControl
Change-Id: I6410cc5fa9e787454a3ed61723b26238012aea6e
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Doris Verria <doris.verria@qt.io>
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/multimedia/qdeclarativecameraviewfinder.cpp | 2 | ||||
| -rw-r--r-- | src/imports/multimedia/qdeclarativecameraviewfinder_p.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/imports/multimedia/qdeclarativecameraviewfinder.cpp b/src/imports/multimedia/qdeclarativecameraviewfinder.cpp index 2b3c16429..26945e69a 100644 --- a/src/imports/multimedia/qdeclarativecameraviewfinder.cpp +++ b/src/imports/multimedia/qdeclarativecameraviewfinder.cpp @@ -40,7 +40,7 @@ #include "qdeclarativecamera_p.h" #include "qdeclarativecameraviewfinder_p.h" -#include <QtMultimedia/qcameraviewfindersettingscontrol.h> +#include <QtMultimedia/qcameracontrol.h> QT_BEGIN_NAMESPACE diff --git a/src/imports/multimedia/qdeclarativecameraviewfinder_p.h b/src/imports/multimedia/qdeclarativecameraviewfinder_p.h index 472f03ece..1b1090432 100644 --- a/src/imports/multimedia/qdeclarativecameraviewfinder_p.h +++ b/src/imports/multimedia/qdeclarativecameraviewfinder_p.h @@ -58,7 +58,6 @@ QT_BEGIN_NAMESPACE class QDeclarativeCamera; -class QCameraViewfinderSettingsControl; class QDeclarativeCameraViewfinder : public QObject { |