diff options
author | Lars Knoll <lars.knoll@qt.io> | 2021-06-16 12:41:04 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2021-06-16 12:41:04 +0200 |
commit | 1f61939866de0ead1771a2e07f2e2f1d393643a5 (patch) | |
tree | a7a4e78126f603e931df651d6837f15d9ffc0dfe /src/multimediaquick/qquickimagecapture_p.h | |
parent | 60b3c6f54d65d03bb028ecade8fd130cfe1ba5c7 (diff) | |
parent | 36fbb6ab08734aff1a73ea4ed255e06bd5aa99f8 (diff) |
Merge remote-tracking branch 'origin/dev' into 6.2
Change-Id: I84ab4bc68611159d8e0d211a509e328319b7cb96
Diffstat (limited to 'src/multimediaquick/qquickimagecapture_p.h')
-rw-r--r-- | src/multimediaquick/qquickimagecapture_p.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/multimediaquick/qquickimagecapture_p.h b/src/multimediaquick/qquickimagecapture_p.h index e035eefdd..f01d95ecf 100644 --- a/src/multimediaquick/qquickimagecapture_p.h +++ b/src/multimediaquick/qquickimagecapture_p.h @@ -53,7 +53,6 @@ #include <qcamera.h> #include <qcameraimagecapture.h> -#include <qmediaencodersettings.h> #include <qmediametadata.h> #include <QtQml/qqml.h> |