diff options
author | Morten Sørvig <morten.sorvig@qt.io> | 2021-04-29 16:05:14 +0200 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-05-03 21:49:14 +0000 |
commit | 207b9346f78ab776507c275c68efe91cf18b4191 (patch) | |
tree | 849e7746acbb4d2e38bb334c58072c72b1e21bc0 /src/plugins | |
parent | 9d6245e92184d321338dc8378f1cbaf6a608584a (diff) |
iOS: Implement QIOSScreen::logicalBaseDpi()
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 <morten.sorvig@qt.io>
(cherry picked from commit e3e070e87b3a8036f7200755ba32b57437304ee6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/plugins')
-rw-r--r-- | src/plugins/platforms/ios/qiosscreen.h | 2 | ||||
-rw-r--r-- | 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 4f494815a9..ee0a816142 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 c7dbe43124..2a9968c841 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); } |