Merge "High-DPI: Set the minimum scale factor to 1"

1 files changed, 3 insertions, 5 deletions

diff --git a/src/gui/kernel/qhighdpiscaling.cpp b/src/gui/kernel/qhighdpiscaling.cpp
index a2ca58e4c2..5bc3f11b3d 100644
--- a/src/gui/kernel/qhighdpiscaling.cpp
+++ b/src/gui/kernel/qhighdpiscaling.cpp
@@ -436,11 +436,9 @@ qreal QHighDpiScaling::roundScaleFactor(qreal rawFactor)
         break;
     }
 
-    // Don't round down to to zero; clamp the minimum (rounded) factor to 1.
-    // This is not a common case but can happen if a display reports a very
-    // low DPI.
-    if (scaleFactorRoundingPolicy != Qt::HighDpiScaleFactorRoundingPolicy::PassThrough)
-        roundedFactor = qMax(roundedFactor, qreal(1));
+    // Clamp the minimum factor to 1. Qt does not currently render
+    // correctly with factors less than 1.
+    roundedFactor = qMax(roundedFactor, qreal(1));
 
     return roundedFactor;
 }