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:18 +0100 |
| commit | aa3226bab32ee24dcf8f88c604638b83ed480f4d (patch) | |
| tree | 5de4e7f54c3aaeddc9f651a8d357fb406117406a /src/widgets/styles/qstylehelper.cpp | |
| parent | 1559c328d536ceb8b7f78892a60aced4716b40b6 (diff) | |
| parent | 65cafea7976d8c5124a5802da004dbd9e27d4b79 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"
Diffstat (limited to 'src/widgets/styles/qstylehelper.cpp')
| -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) |