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>
This commit is contained in:
Morten Johan Sørvig 2020-01-13 14:48:32 +01:00
parent 06a7da3c3d
commit b31852c4ca

View File

@ -535,7 +535,7 @@ void QHighDpiScaling::updateHighDpiScaling()
++i;
}
}
m_active = m_globalScalingActive || m_screenFactorSet || m_usePixelDensity;
m_active = m_globalScalingActive || m_screenFactorSet || m_pixelDensityScalingActive;
}
/*