Merge remote-tracking branch 'origin/5.6' into dev

Conflicts:
	src/plugins/android/src/mediacapture/qandroidcamerasession.cpp
	src/plugins/wmf/mftvideo.cpp

Change-Id: I78868b416ea4baec89ca3e2dc9eb4712db16d5fc

1 files changed, 3 insertions, 7 deletions

diff --git a/src/plugins/avfoundation/camera/avfcameraviewfindersettingscontrol.h b/src/plugins/avfoundation/camera/avfcameraviewfindersettingscontrol.h
index cf2f512a7..9a5bbd5de 100644
--- a/src/plugins/avfoundation/camera/avfcameraviewfindersettingscontrol.h
+++ b/src/plugins/avfoundation/camera/avfcameraviewfindersettingscontrol.h
@@ -76,17 +76,13 @@ private:
     AVCaptureDeviceFormat *findBestFormatMatch(const QCameraViewfinderSettings &settings) const;
     QVector<QVideoFrame::PixelFormat> viewfinderPixelFormats() const;
     bool convertPixelFormatIfSupported(QVideoFrame::PixelFormat format, unsigned &avfFormat) const;
-    void applySettings();
+    bool applySettings();
     QCameraViewfinderSettings requestedSettings() const;
-    // Aux. function to extract things like captureDevice, videoOutput, etc.
-    bool updateAVFoundationObjects() const;
+
+    AVCaptureConnection *videoConnection() const;
 
     AVFCameraService *m_service;
-    mutable AVFCameraSession *m_session;
     QCameraViewfinderSettings m_settings;
-    mutable AVCaptureDevice *m_captureDevice;
-    mutable AVCaptureVideoDataOutput *m_videoOutput;
-    mutable AVCaptureConnection *m_videoConnection;
 };
 
 class AVFCameraViewfinderSettingsControl : public QCameraViewfinderSettingsControl