1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

uikit: Remove use of ifdef when resolving available screen geometry

Browse Source 
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>
This commit is contained in:
Tor Arne Vestbø 2016-06-01 13:29:07 +02:00 committed by Jake Petroules
parent 58566686fc
commit 88ebee5cd7
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/platforms/ios/qiosscreen.mm
View File

@ -232,11 +232,8 @@ void QIOSScreen::updateProperties()
QRect previousAvailableGeometry = m_availableGeometry; QRect previousAvailableGeometry = m_availableGeometry;
m_geometry = QRectF::fromCGRect(m_uiScreen.bounds).toRect(); m_geometry = QRectF::fromCGRect(m_uiScreen.bounds).toRect();
#ifndef Q_OS_TVOS m_availableGeometry = QSysInfo::MacintoshVersion & QSysInfo::MV_IOS ?
m_availableGeometry = QRectF::fromCGRect(m_uiScreen.applicationFrame).toRect(); QRectF::fromCGRect(m_uiScreen.applicationFrame).toRect() : m_geometry;
#else
m_availableGeometry = QRectF::fromCGRect(m_uiScreen.bounds).toRect();
#endif
#ifndef Q_OS_TVOS #ifndef Q_OS_TVOS
if (m_uiScreen == [UIScreen mainScreen]) { if (m_uiScreen == [UIScreen mainScreen]) {