diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-22 01:00:07 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-22 01:00:07 +0100 |
| commit | 65cafea7976d8c5124a5802da004dbd9e27d4b79 (patch) | |
| tree | c2d6c6e703b8905015efa10858e5abb6a3332d45 /src/widgets | |
| parent | 6248bfd9e58b396cf574a16b730e6bd5d089fb0c (diff) | |
| parent | 4e1c41a26eaa51ebb133e9c846e8e93bbe318a2e (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: Iace12004afdfe765a3068dfcf6f1320c1123c539
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/styles/qstylehelper.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/widgets/styles/qstylehelper.cpp b/src/widgets/styles/qstylehelper.cpp index 61a59b03c1..ea65227fd5 100644 --- a/src/widgets/styles/qstylehelper.cpp +++ b/src/widgets/styles/qstylehelper.cpp @@ -101,7 +101,13 @@ Q_WIDGETS_EXPORT qreal dpi(const QStyleOption *option) if (option) return option->fontMetrics.fontDpi(); + // Fall back to historical Qt behavior: hardocded 72 DPI on mac, + // primary screen DPI on other platforms. +#ifdef Q_OS_DARWIN return qstyleBaseDpi; +#else + return qt_defaultDpiX(); +#endif } Q_WIDGETS_EXPORT qreal dpiScaled(qreal value, qreal dpi) |