diff options
| author | Liang Qi <liang.qi@qt.io> | 2020-01-28 09:16:11 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2020-01-28 09:16:11 +0100 |
| commit | 54b1f1d199eb0d03883240bcbb688fc3051005f0 (patch) | |
| tree | 40277c535779db90c690a1e05fcbbc21c90b7454 /src/gui | |
| parent | 1ed802e3b8a7f236bd277719090f461a87eae78e (diff) | |
| parent | 0ab53fbdda2fd7f24f45dcd52fbd195e282554da (diff) | |
Merge remote-tracking branch 'origin/5.14.1' into 5.14
Conflicts:
mkspecs/features/create_cmake.prf
Done-With: Artem Pisarenko <artem.k.pisarenko@gmail.com>
Change-Id: I2ecb9fdca06fe687be8ab3457a58dd81e5e81c4c
Diffstat (limited to 'src/gui')
| -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; } /* |