2 files changed, 4 insertions, 12 deletions
diff --git a/src/plugins/avfoundation/camera/avfimagecapturecontrol.h b/src/plugins/avfoundation/camera/avfimagecapturecontrol.h
index 1fee8164c..dd5e8e8bb 100644
--- a/src/plugins/avfoundation/camera/avfimagecapturecontrol.h
+++ b/src/plugins/avfoundation/camera/avfimagecapturecontrol.h
@@ -39,7 +39,6 @@
 #include <QtCore/qqueue.h>
 #include <QtCore/qsemaphore.h>
 #include <QtMultimedia/qcameraimagecapturecontrol.h>
-#include <private/qvideooutputorientationhandler_p.h>
 #include "avfcamerasession.h"
 #include "avfstoragelocation.h"
 
@@ -72,7 +71,7 @@ private Q_SLOTS:
     void onNewViewfinderFrame(const QVideoFrame &frame);
 
 private:
-    void makeCapturePreview(CaptureRequest request, const QVideoFrame &frame, AVFCameraInfo cameraInfo, int screenOrientation);
+    void makeCapturePreview(CaptureRequest request, const QVideoFrame &frame, int rotation);
 
     AVFCameraSession *m_session;
     AVFCameraControl *m_cameraControl;
@@ -81,7 +80,6 @@ private:
     AVCaptureStillImageOutput *m_stillImageOutput;
     AVCaptureConnection *m_videoConnection;
     AVFStorageLocation m_storageLocation;
-    QVideoOutputOrientationHandler m_orientationHandler;
 
     QMutex m_requestsMutex;
     QQueue<CaptureRequest> m_captureRequests;
diff --git a/src/plugins/avfoundation/camera/avfimagecapturecontrol.mm b/src/plugins/avfoundation/camera/avfimagecapturecontrol.mm
index 4703f8727..edaaf8ce3 100644
--- a/src/plugins/avfoundation/camera/avfimagecapturecontrol.mm
+++ b/src/plugins/avfoundation/camera/avfimagecapturecontrol.mm
@@ -180,21 +180,15 @@ void AVFImageCaptureControl::onNewViewfinderFrame(const QVideoFrame &frame)
     QtConcurrent::run(this, &AVFImageCaptureControl::makeCapturePreview,
                       request,
                       frame,
-                      m_session->activeCameraInfo(),
-                      m_orientationHandler.currentOrientation());
+                      0 /* rotation */);
 }
 
 void AVFImageCaptureControl::makeCapturePreview(CaptureRequest request,
                                                 const QVideoFrame &frame,
-                                                AVFCameraInfo cameraInfo,
-                                                int screenOrientation)
+                                                int rotation)
 {
     QTransform transform;
-    screenOrientation = 360 - screenOrientation;
-    if (cameraInfo.position == QCamera::FrontFace)
-        transform.rotate((screenOrientation + cameraInfo.orientation) % 360);
-    else
-        transform.rotate((screenOrientation + (360 - cameraInfo.orientation)) % 360);
+    transform.rotate(rotation);
 
     Q_EMIT imageCaptured(request.captureId, qt_imageFromVideoFrame(frame).transformed(transform));