diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2020-01-16 23:51:22 +0100 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2020-01-17 00:53:06 +0100 |
commit | 2097e30779ee62d4846364fbc86a33a61798ad37 (patch) | |
tree | ace97a7c48096ade8372475d586e52d9259ac7fa /dev-qt/qtgui/files | |
parent | media-gfx/plantuml: bump to 1.2020.0 (diff) | |
download | gentoo-2097e30779ee62d4846364fbc86a33a61798ad37.tar.gz gentoo-2097e30779ee62d4846364fbc86a33a61798ad37.tar.bz2 gentoo-2097e30779ee62d4846364fbc86a33a61798ad37.zip |
dev-qt/qtgui: Restore QHighDPIScaling::isActive() 5.13 behavior
See also: https://phabricator.kde.org/D26185
See also: https://bugreports.qt.io/browse/QTBUG-80967
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'dev-qt/qtgui/files')
-rw-r--r-- | dev-qt/qtgui/files/qtgui-5.14.0-restore-scaling.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/dev-qt/qtgui/files/qtgui-5.14.0-restore-scaling.patch b/dev-qt/qtgui/files/qtgui-5.14.0-restore-scaling.patch new file mode 100644 index 000000000000..5fc047aa7ec0 --- /dev/null +++ b/dev-qt/qtgui/files/qtgui-5.14.0-restore-scaling.patch @@ -0,0 +1,34 @@ +From b31852c4caa36cc564e25adbdacfa534e1dfe7c0 Mon Sep 17 00:00:00 2001 +From: =?utf8?q?Morten=20Johan=20S=C3=B8rvig?= <morten.sorvig@qt.io> +Date: Mon, 13 Jan 2020 14:48:32 +0100 +Subject: [PATCH] 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 fde6bb0180b..671c2d93ef6 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; + } + + /* +-- +2.16.3 + |