From: Miikka Heikkinen <miikka.heikkinen@digia.com>
Date: Wed, 7 Mar 2012 11:31:30 +0000 (+0200)
Subject: Windows: Fix override cursor logic
X-Git-Tag: qt-v5.0.0-alpha1~498
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=83d113feb01be72f9a0f1714b69541e7ebc7c4ca;p=profile%2Fivi%2Fqtbase.git

Windows: Fix override cursor logic

Fixed a logic error that prevented override cursors being applied in
Windows plugin. The logic for override cursor handling is already
in crossplatform code, so no need to do extra checks in plugin.

Task-number: QTBUG-24657
Change-Id: Ied9b36b57f22607ef5bb5c30f2926b0053eebca5
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
---

diff --git a/src/plugins/platforms/windows/qwindowswindow.cpp b/src/plugins/platforms/windows/qwindowswindow.cpp
index b2ebe06..f5cac4d 100644
--- a/src/plugins/platforms/windows/qwindowswindow.cpp
+++ b/src/plugins/platforms/windows/qwindowswindow.cpp
@@ -1309,16 +1309,14 @@ void QWindowsWindow::getSizeHints(MINMAXINFO *mmi) const
 }
 
 /*!
-    \brief Applies to cursor property set on the window to the global cursor
-    unless there is an override cursor.
+    \brief Applies to cursor property set on the window to the global cursor.
 
     \sa QWindowsCursor
 */
 
 void QWindowsWindow::applyCursor()
 {
-    if (!QGuiApplication::overrideCursor())
-        SetCursor(m_cursor.handle());
+    SetCursor(m_cursor.handle());
 }
 
 void QWindowsWindow::setCursor(const QWindowsWindowCursor &c)