From 859307d7a590873d8df5f8094e13043370fccaa7 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Wed, 25 Sep 2019 15:04:36 +0200
Subject: Windows QPA: Provide an experimental palette for dark mode

Provide a simple palette for dark mode, implementing
dark mode support level 2.

Task-number: QTBUG-72028
Change-Id: I6f71870b251ccb7da30c01abb22c224e600f2b27
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
---
 src/plugins/styles/windowsvista/qwindowsxpstyle.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/plugins/styles/windowsvista/qwindowsxpstyle.cpp')

diff --git a/src/plugins/styles/windowsvista/qwindowsxpstyle.cpp b/src/plugins/styles/windowsvista/qwindowsxpstyle.cpp
index 5d2e8efd68..899e7f7c17 100644
--- a/src/plugins/styles/windowsvista/qwindowsxpstyle.cpp
+++ b/src/plugins/styles/windowsvista/qwindowsxpstyle.cpp
@@ -225,9 +225,11 @@ static HRGN qt_hrgn_from_qregion(const QRegion &region)
 */
 bool QWindowsXPStylePrivate::useXP(bool update)
 {
-    if (!update)
-        return use_xp;
-    return use_xp = IsThemeActive() && (IsAppThemed() || !QCoreApplication::instance());
+    if (update) {
+        use_xp = IsThemeActive() && (IsAppThemed() || !QCoreApplication::instance())
+                 && !QWindowsStylePrivate::isDarkMode();
+    }
+    return use_xp;
 }
 
 /* \internal
-- 
cgit v1.2.3


From 4bb897a3841f0f79150787e29fe122e1410bc119 Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Fri, 10 Jan 2020 10:08:37 +0100
Subject: Deprecate all methods that use QMatrix

Don't use QMatrix in implementation classes anymore.

Task-number: QTBUG-46653
Fixes: QTBUG-81627
Change-Id: I4806c1302e42645dc6a608062c8d9c336ae8629b
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
---
 src/plugins/styles/windowsvista/qwindowsxpstyle.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/plugins/styles/windowsvista/qwindowsxpstyle.cpp')

diff --git a/src/plugins/styles/windowsvista/qwindowsxpstyle.cpp b/src/plugins/styles/windowsvista/qwindowsxpstyle.cpp
index 899e7f7c17..9ae8bd6c90 100644
--- a/src/plugins/styles/windowsvista/qwindowsxpstyle.cpp
+++ b/src/plugins/styles/windowsvista/qwindowsxpstyle.cpp
@@ -1025,7 +1025,7 @@ bool QWindowsXPStylePrivate::drawBackgroundThruNativeBuffer(XPThemeData &themeDa
             imgCopy = cachedPixmap.toImage();
 
         if (themeData.rotate) {
-            QMatrix rotMatrix;
+            QTransform rotMatrix;
             rotMatrix.rotate(themeData.rotate);
             imgCopy = imgCopy.transformed(rotMatrix);
         }
-- 
cgit v1.2.3