From 88ebee5cd7fe2416775b12b25498ac86ac4d9af8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Wed, 1 Jun 2016 13:29:07 +0200 Subject: [PATCH] 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 --- src/plugins/platforms/ios/qiosscreen.mm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/plugins/platforms/ios/qiosscreen.mm b/src/plugins/platforms/ios/qiosscreen.mm index ea17e34fe23..246f04b8dc1 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]) {