3 files changed, 10 insertions, 1 deletions
diff --git a/src/plugins/avfoundation/camera/avfcamerasession.mm b/src/plugins/avfoundation/camera/avfcamerasession.mm
index 2cb3824db..5bf841bec 100644
--- a/src/plugins/avfoundation/camera/avfcamerasession.mm
+++ b/src/plugins/avfoundation/camera/avfcamerasession.mm
@@ -365,8 +365,10 @@ void AVFCameraSession::applyViewfinderSettings()
 {
     if (AVFCameraViewfinderSettingsControl2 *vfControl = m_service->viewfinderSettingsControl2()) {
         QCameraViewfinderSettings vfSettings(vfControl->requestedSettings());
+        // Viewfinder and image capture solutions must be the same, if an image capture
+        // resolution is set, it takes precedence over the viewfinder resolution.
         if (AVFImageEncoderControl *imControl = m_service->imageEncoderControl()) {
-            const QSize imageResolution(imControl->imageSettings().resolution());
+            const QSize imageResolution(imControl->requestedSettings().resolution());
             if (!imageResolution.isNull() && imageResolution.isValid()) {
                 vfSettings.setResolution(imageResolution);
                 vfControl->setViewfinderSettings(vfSettings);
diff --git a/src/plugins/avfoundation/camera/avfimageencodercontrol.h b/src/plugins/avfoundation/camera/avfimageencodercontrol.h
index fcb665a03..c805b3e21 100644
--- a/src/plugins/avfoundation/camera/avfimageencodercontrol.h
+++ b/src/plugins/avfoundation/camera/avfimageencodercontrol.h
@@ -62,6 +62,8 @@ public:
     QImageEncoderSettings imageSettings() const Q_DECL_OVERRIDE;
     void setImageSettings(const QImageEncoderSettings &settings) Q_DECL_OVERRIDE;
 
+    QImageEncoderSettings requestedSettings() const;
+
 private:
     AVFCameraService *m_service;
     QImageEncoderSettings m_settings;
diff --git a/src/plugins/avfoundation/camera/avfimageencodercontrol.mm b/src/plugins/avfoundation/camera/avfimageencodercontrol.mm
index 36050c3a2..a5e9c0e09 100644
--- a/src/plugins/avfoundation/camera/avfimageencodercontrol.mm
+++ b/src/plugins/avfoundation/camera/avfimageencodercontrol.mm
@@ -115,6 +115,11 @@ QList<QSize> AVFImageEncoderControl::supportedResolutions(const QImageEncoderSet
     return resolutions;
 }
 
+QImageEncoderSettings AVFImageEncoderControl::requestedSettings() const
+{
+    return m_settings;
+}
+
 QImageEncoderSettings AVFImageEncoderControl::imageSettings() const
 {
     QImageEncoderSettings settings;