diff options
| author | Morten Johan Sørvig <morten.sorvig@qt.io> | 2020-01-13 14:48:32 +0100 |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@qt.io> | 2020-01-14 15:24:43 +0000 |
| commit | b31852c4caa36cc564e25adbdacfa534e1dfe7c0 (patch) | |
| tree | b69b4668e7e86eba9b7cca884403637487bee1e8 | |
| parent | 06a7da3c3d9654748e21efff72db6f85c319ea43 (diff) | |
Restore QHighDPIScaling::isActive() 5.13 behavior
In 5.13, isActive() would become true only if there
was a scale factor >1 present. This was accidentally
changed in 5.14, where isActive() becomes true whenever
e.g. AA_EneableHighDpiScaling is set, no matter the actual
scale factor values.
Change-Id: Iacbe2010cddbc3b9015ac24004ae2fe417d4f434
Fixes: QTBUG-80967
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| -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 fde6bb0180..671c2d93ef 100644 --- a/src/gui/kernel/qhighdpiscaling.cpp +++ b/src/gui/kernel/qhighdpiscaling.cpp @@ -535,7 +535,7 @@ void QHighDpiScaling::updateHighDpiScaling() ++i; } } - m_active = m_globalScalingActive || m_screenFactorSet || m_usePixelDensity; + m_active = m_globalScalingActive || m_screenFactorSet || m_pixelDensityScalingActive; } /* |