diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2017-09-23 17:18:59 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2017-09-29 17:18:52 +0000 |
| commit | 41ef172d1cee40c42d14ff7824baedf11060b987 (patch) | |
| tree | c7bc7828123f90130fea66f5a3438af1f0cd413a /src/plugins/avfoundation/camera/avfcamerautility.mm | |
| parent | 0c6faf31e643dda71f7068e5124f2e1889918cd2 (diff) | |
Remove obsolete version checksv5.10.0-beta1
Our iOS deployment target is now 8; this code will always be executed.
Change-Id: Ia42bfa9e1fc96cb8048806a80c80bf3dda35a180
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
Diffstat (limited to 'src/plugins/avfoundation/camera/avfcamerautility.mm')
| -rw-r--r-- | src/plugins/avfoundation/camera/avfcamerautility.mm | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/plugins/avfoundation/camera/avfcamerautility.mm b/src/plugins/avfoundation/camera/avfcamerautility.mm index 872075e0f..22713d613 100644 --- a/src/plugins/avfoundation/camera/avfcamerautility.mm +++ b/src/plugins/avfoundation/camera/avfcamerautility.mm @@ -40,7 +40,6 @@ #include "avfcamerautility.h" #include "avfcameradebug.h" -#include <QtCore/qoperatingsystemversion.h> #include <QtCore/qvector.h> #include <QtCore/qpair.h> #include <private/qmultimediautils_p.h> @@ -180,12 +179,10 @@ QSize qt_device_format_high_resolution(AVCaptureDeviceFormat *format) { Q_ASSERT(format); QSize res; -#if defined(Q_OS_IOS) && QT_IOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__IPHONE_8_0) - if (QOperatingSystemVersion::current() >= QOperatingSystemVersion(QOperatingSystemVersion::IOS, 8)) { - const CMVideoDimensions hrDim(format.highResolutionStillImageDimensions); - res.setWidth(hrDim.width); - res.setHeight(hrDim.height); - } +#if defined(Q_OS_IOS) + const CMVideoDimensions hrDim(format.highResolutionStillImageDimensions); + res.setWidth(hrDim.width); + res.setHeight(hrDim.height); #endif return res; } |