diff options
| author | David Faure <david.faure@kdab.com> | 2019-09-07 22:32:35 +0200 |
|---|---|---|
| committer | David Faure <david.faure@kdab.com> | 2019-09-10 00:09:02 +0200 |
| commit | e018d11600bffc6e54cddd3857822516f3f501a0 (patch) | |
| tree | 20191f462f90bddef9f6027c02a405044a1a2d1a /src/gui/kernel/qhighdpiscaling.cpp | |
| parent | 8c41e25bea4d6a7bdcd8002c71c37be84a8ef405 (diff) | |
Dpi settings: QT_SCREEN_SCALE_FACTORS enables scaling again
commit 900f2cb6f7070 removed this from the condition, which breaks the
(common) case of having QT_AUTO_SCREEN_SCALE_FACTOR=0 and
QT_SCREEN_SCALE_FACTORS set. This used to obey the screen scale factors,
so it should still do so (despite the deprecation warning).
This is what the Plasma `kcmshell5 kscreen` module actually sets (via
startkde).
Change-Id: I5f4efed11b937498049ebf1b107954721cf54147
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Diffstat (limited to 'src/gui/kernel/qhighdpiscaling.cpp')
| -rw-r--r-- | src/gui/kernel/qhighdpiscaling.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qhighdpiscaling.cpp b/src/gui/kernel/qhighdpiscaling.cpp index ec4feeba8b..dcbae4f5c0 100644 --- a/src/gui/kernel/qhighdpiscaling.cpp +++ b/src/gui/kernel/qhighdpiscaling.cpp @@ -538,7 +538,7 @@ void QHighDpiScaling::updateHighDpiScaling() ++i; } } - m_active = m_globalScalingActive || m_usePixelDensity; + m_active = m_globalScalingActive || m_screenFactorSet || m_usePixelDensity; } /* |