From 9ad00e4b3f4d71f31ba041af623741522a221ffc Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Mon, 6 Dec 2021 10:45:04 +0100
Subject: Windows QPA: Fix cursors getting out of sync after restoring override
 cursors on native windows
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Introduce a flag to QWindowsWindow which forces the cursor to be applied
after restoring override cursors.

Fixes: QTBUG-98856
Pick-to: 6.2 5.15
Change-Id: Id62cdc2dd01f45324503a542446b1c11a1fe6f44
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Keith Kyzivat <keith.kyzivat@qt.io>
Reviewed-by: André de la Rocha <andre.rocha@qt.io>
---
 src/plugins/platforms/windows/qwindowscontext.h | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/plugins/platforms/windows/qwindowscontext.h')

diff --git a/src/plugins/platforms/windows/qwindowscontext.h b/src/plugins/platforms/windows/qwindowscontext.h
index d1d5139fb3..2b0bb47405 100644
--- a/src/plugins/platforms/windows/qwindowscontext.h
+++ b/src/plugins/platforms/windows/qwindowscontext.h
@@ -86,6 +86,7 @@ class QWindowsContext
 {
     Q_DISABLE_COPY_MOVE(QWindowsContext)
 public:
+    using HandleBaseWindowHash = QHash<HWND, QWindowsWindow *>;
 
     enum SystemInfoFlags
     {
@@ -168,6 +169,8 @@ public:
     bool useRTLExtensions() const;
     QList<int> possibleKeys(const QKeyEvent *e) const;
 
+    HandleBaseWindowHash &windows();
+
     static bool isSessionLocked();
 
     QWindowsMimeConverter &mimeConverter() const;
-- 
cgit v1.2.3