From 207b9346f78ab776507c275c68efe91cf18b4191 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morten=20S=C3=B8rvig?= Date: Thu, 29 Apr 2021 16:05:14 +0200 Subject: [PATCH] iOS: Implement QIOSScreen::logicalBaseDpi() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit logicalDpi() and logicalBaseDpi() should return the same DPI on iOS, in order to make Qt not apply a scale factor. Accomplish this by overriding logicalBaseDpi() instead of logicalDpi(). The default QPlatformScreen::logicalDpi() implementation will then call logicalBaseDpi(). Fixes: QTBUG-92579 Change-Id: I7a27cf61f0154cef32098069ab3dfb29ad6acf27 Reviewed-by: Morten Johan Sørvig (cherry picked from commit e3e070e87b3a8036f7200755ba32b57437304ee6) Reviewed-by: Qt Cherry-pick Bot --- src/plugins/platforms/ios/qiosscreen.h | 2 +- src/plugins/platforms/ios/qiosscreen.mm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/platforms/ios/qiosscreen.h b/src/plugins/platforms/ios/qiosscreen.h index 4f494815a99..ee0a8161428 100644 --- a/src/plugins/platforms/ios/qiosscreen.h +++ b/src/plugins/platforms/ios/qiosscreen.h @@ -67,7 +67,7 @@ public: int depth() const override; QImage::Format format() const override; QSizeF physicalSize() const override; - QDpi logicalDpi() const override; + QDpi logicalBaseDpi() const override; qreal devicePixelRatio() const override; qreal refreshRate() const override; diff --git a/src/plugins/platforms/ios/qiosscreen.mm b/src/plugins/platforms/ios/qiosscreen.mm index c7dbe431244..2a9968c8416 100644 --- a/src/plugins/platforms/ios/qiosscreen.mm +++ b/src/plugins/platforms/ios/qiosscreen.mm @@ -462,7 +462,7 @@ QSizeF QIOSScreen::physicalSize() const return m_physicalSize; } -QDpi QIOSScreen::logicalDpi() const +QDpi QIOSScreen::logicalBaseDpi() const { return QDpi(72, 72); }