diff options
author | Jake Petroules <jake.petroules@petroules.com> | 2014-09-04 02:54:17 +0200 |
---|---|---|
committer | Jake Petroules <jake.petroules@petroules.com> | 2014-09-04 18:13:10 +0200 |
commit | 20cf2debfb980d5d5741396bafa9984d52ded5a7 (patch) | |
tree | 419b6f7fa437a72930c109392de54901aa36402f /src/plugins/platforms | |
parent | eb447679456336d387bb69a56c164b06fbe83166 (diff) |
Revert "iOS: Update QIOSScreen::nativeOrientation() for iOS8"
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ø <tor.arne.vestbo@digia.com>
Diffstat (limited to 'src/plugins/platforms')
-rw-r--r-- | src/plugins/platforms/ios/qiosscreen.mm | 11 |
1 files changed, 2 insertions, 9 deletions
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; } |