Merge remote-tracking branch 'origin/5.11' into dev

Change-Id: Ic811cd444e523b904211797112bba6aaec85dddd

2 files changed, 3 insertions, 0 deletions

diff --git a/src/plugins/platforms/windows/qwindowscursor.h b/src/plugins/platforms/windows/qwindowscursor.h
index 4772f3fce5..53f185358b 100644
--- a/src/plugins/platforms/windows/qwindowscursor.h
+++ b/src/plugins/platforms/windows/qwindowscursor.h
@@ -107,6 +107,7 @@ public:
     void changeCursor(QCursor * widgetCursor, QWindow * widget) override;
     void setOverrideCursor(const QCursor &cursor) override;
     void clearOverrideCursor() override;
+    bool hasOverrideCursor() const { return m_overriddenCursor != nullptr; }
 
     QPoint pos() const override;
     void setPos(const QPoint &pos) override;
diff --git a/src/plugins/platforms/windows/qwindowswindow.cpp b/src/plugins/platforms/windows/qwindowswindow.cpp
index 9872b6b4e0..f1762146ec 100644
--- a/src/plugins/platforms/windows/qwindowswindow.cpp
+++ b/src/plugins/platforms/windows/qwindowswindow.cpp
@@ -2410,6 +2410,8 @@ static inline bool applyNewCursor(const QWindow *w)
 
 void QWindowsWindow::applyCursor()
 {
+    if (static_cast<const QWindowsCursor *>(screen()->cursor())->hasOverrideCursor())
+        return;
 #ifndef QT_NO_CURSOR
     if (m_cursor->isNull()) { // Recurse up to parent with non-null cursor. Set default for toplevel.
         if (const QWindow *p = window()->parent()) {