diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2016-06-01 13:29:07 +0200 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2016-06-14 17:23:49 +0000 |
| commit | 88ebee5cd7fe2416775b12b25498ac86ac4d9af8 (patch) | |
| tree | c9dea02d2ada5cc097af49f6ee968c8b9dea19b0 /src/plugins/platforms/ios/qiosscreen.mm | |
| parent | 58566686fcfceee1caeab88d0531816f4df49192 (diff) | |
uikit: Remove use of ifdef when resolving available screen geometry
More explicit that we're falling back to m_geometry on non-iOS platforms.
Change-Id: I09bd5270aee5edb977983893a8407218eea0f74a
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'src/plugins/platforms/ios/qiosscreen.mm')
| -rw-r--r-- | src/plugins/platforms/ios/qiosscreen.mm | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/plugins/platforms/ios/qiosscreen.mm b/src/plugins/platforms/ios/qiosscreen.mm index ea17e34fe2..246f04b8dc 100644 --- a/src/plugins/platforms/ios/qiosscreen.mm +++ b/src/plugins/platforms/ios/qiosscreen.mm @@ -232,11 +232,8 @@ void QIOSScreen::updateProperties() QRect previousAvailableGeometry = m_availableGeometry; m_geometry = QRectF::fromCGRect(m_uiScreen.bounds).toRect(); -#ifndef Q_OS_TVOS - m_availableGeometry = QRectF::fromCGRect(m_uiScreen.applicationFrame).toRect(); -#else - m_availableGeometry = QRectF::fromCGRect(m_uiScreen.bounds).toRect(); -#endif + m_availableGeometry = QSysInfo::MacintoshVersion & QSysInfo::MV_IOS ? + QRectF::fromCGRect(m_uiScreen.applicationFrame).toRect() : m_geometry; #ifndef Q_OS_TVOS if (m_uiScreen == [UIScreen mainScreen]) { |