qt5-base

desktop/toolkit/qt5/qt5-base/files/qtbug-80967.patch

@@ -0,0 +1,34 @@
+From b31852c4caa36cc564e25adbdacfa534e1dfe7c0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Morten=20Johan=20S=C3=B8rvig?= <morten.sorvig@qt.io>
+Date: Mon, 13 Jan 2020 14:48:32 +0100
+Subject: 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>
+---
+ src/gui/kernel/qhighdpiscaling.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+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;
+ }
+ 
+ /*
+-- 
+cgit v1.2.1
+

desktop/toolkit/qt5/qt5-base/pspec.xml

@@ -80,7 +80,7 @@
         <Patches>
         <!-- Pisilinux Patches -->
         <Patch>mkspecs2.patch</Patch>
-<!--             <Patch level="1">qtbug-77364.patch</Patch> -->
+            <Patch level="1">qtbug-80967.patch</Patch>
 <!--             <Patch level="1">qtbase-zlib-compression.patch</Patch> -->
 <!--             <Patch level="1">virtualbox-focus.patch</Patch> -->
         </Patches>
@@ -269,7 +269,7 @@
 
     <History>
         <Update release="22">
-            <Date>2019-12-22</Date>
+            <Date>2020-01-17</Date>
             <Version>5.14.0</Version>
             <Comment>Version bump.</Comment>
             <Name>Mustafa Cinasal</Name>