From 20cf2debfb980d5d5741396bafa9984d52ded5a7 Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Thu, 4 Sep 2014 02:54:17 +0200 Subject: Revert "iOS: Update QIOSScreen::nativeOrientation() for iOS8" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit f6c36917f15fda0066bf996c1d36ef6dace9f404. Depends on 203ce7c5ce36f300750607b74b2d2429be2d4959 which can't go into 5.3 because it introduces new enum values. Change-Id: I13040a7268fae4baeace244a3e75dc982d3a50b8 Reviewed-by: Tor Arne Vestbø --- src/plugins/platforms/ios/qiosscreen.mm | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'src/plugins') diff --git a/src/plugins/platforms/ios/qiosscreen.mm b/src/plugins/platforms/ios/qiosscreen.mm index bb51d79e2a..5331d05ae9 100644 --- a/src/plugins/platforms/ios/qiosscreen.mm +++ b/src/plugins/platforms/ios/qiosscreen.mm @@ -294,15 +294,8 @@ qreal QIOSScreen::devicePixelRatio() const Qt::ScreenOrientation QIOSScreen::nativeOrientation() const { - CGRect nativeBounds = -#if QT_IOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__IPHONE_8_0) - QSysInfo::MacintoshVersion >= QSysInfo::MV_IOS_8_0 ? m_uiScreen.nativeBounds : -#endif - m_uiScreen.bounds; - - // All known iOS devices have a native orientation of portrait, but to - // be on the safe side we compare the width and height of the bounds. - return nativeBounds.size.width >= nativeBounds.size.height ? + // A UIScreen stays in the native orientation, regardless of rotation + return m_uiScreen.bounds.size.width >= m_uiScreen.bounds.size.height ? Qt::LandscapeOrientation : Qt::PortraitOrientation; } -- cgit v1.2.3