Per-screen scaleFactor

To enable, set QT_SCALE_FACTOR=auto

Tons of bugs, since this does not port all the QT_DEVICE_PIXEL_RATIO
fixes from xcb.

1 files changed, 3 insertions, 1 deletions

diff --git a/src/gui/kernel/qhighdpiscaling_p.h b/src/gui/kernel/qhighdpiscaling_p.h
index 6929b3ac83..5827bc1565 100644
--- a/src/gui/kernel/qhighdpiscaling_p.h
+++ b/src/gui/kernel/qhighdpiscaling_p.h
@@ -79,11 +79,13 @@ Q_DECLARE_LOGGING_CATEGORY(lcScaling);
 class Q_GUI_EXPORT QHighDpiScaling {
 public:
     static bool isActive() { return m_active; }
-    static qreal factor(const QWindow *window = 0);
+    static qreal factor(const QWindow *window);
+    static qreal factor(const QScreen *screen);
     static void setFactor(qreal factor);
     static void setWindowFactor(QWindow *window, qreal factor);
 private:
     static qreal m_factor;
+    static bool m_autoFactor;
     static bool m_active;
     static bool m_perWindowActive;
 };