1 files changed, 31 insertions, 3 deletions
diff --git a/src/plugins/platforms/windows/qwindowscursor.cpp b/src/plugins/platforms/windows/qwindowscursor.cpp
index 0a09b87ba3..1da7de7451 100644
--- a/src/plugins/platforms/windows/qwindowscursor.cpp
+++ b/src/plugins/platforms/windows/qwindowscursor.cpp
@@ -548,6 +548,8 @@ CursorHandlePtr QWindowsCursor::standardWindowCursor(Qt::CursorShape shape)
     return it != m_standardCursorCache.end() ? it.value() : CursorHandlePtr(new CursorHandle);
 }
 
+HCURSOR QWindowsCursor::m_overriddenCursor = nullptr;
+
 /*!
     \brief Return cached pixmap cursor or create new one.
 */
@@ -586,6 +588,13 @@ QWindowsCursor::QWindowsCursor(const QPlatformScreen *screen)
     Q_UNUSED(dummy)
 }
 
+inline CursorHandlePtr QWindowsCursor::cursorHandle(const QCursor &cursor)
+{
+    return cursor.shape() == Qt::BitmapCursor
+        ? pixmapWindowCursor(cursor)
+        : standardWindowCursor(cursor.shape());
+}
+
 /*!
     \brief Set a cursor on a window.
 
@@ -603,9 +612,7 @@ void QWindowsCursor::changeCursor(QCursor *cursorIn, QWindow *window)
         platformWindow->setCursor(CursorHandlePtr(new CursorHandle));
         return;
     }
-    const CursorHandlePtr wcursor =
-        cursorIn->shape() == Qt::BitmapCursor ?
-        pixmapWindowCursor(*cursorIn) : standardWindowCursor(cursorIn->shape());
+    const CursorHandlePtr wcursor = cursorHandle(*cursorIn);
     if (wcursor->handle()) {
         platformWindow->setCursor(wcursor);
     } else {
@@ -614,6 +621,27 @@ void QWindowsCursor::changeCursor(QCursor *cursorIn, QWindow *window)
     }
 }
 
+void QWindowsCursor::setOverrideCursor(const QCursor &cursor)
+{
+    const CursorHandlePtr wcursor = cursorHandle(cursor);
+    if (wcursor->handle()) {
+        const HCURSOR previousCursor = SetCursor(wcursor->handle());
+        if (m_overriddenCursor == nullptr)
+            m_overriddenCursor = previousCursor;
+    } else {
+        qWarning("%s: Unable to obtain system cursor for %d",
+                 __FUNCTION__, cursor.shape());
+    }
+}
+
+void QWindowsCursor::clearOverrideCursor()
+{
+    if (m_overriddenCursor) {
+        SetCursor(m_overriddenCursor);
+        m_overriddenCursor = nullptr;
+    }
+}
+
 QPoint QWindowsCursor::mousePosition()
 {
     POINT p;