summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2012-03-07 13:31:30 +0200
committerQt by Nokia <qt-info@nokia.com>2012-03-07 16:37:42 +0100
commit83d113feb01be72f9a0f1714b69541e7ebc7c4ca (patch)
tree1d8e3498154414f85e4353601bfce1fc99428c77
parent24be238fccee67ad060247ad22e15b6bddd506e0 (diff)
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>
-rw-r--r--src/plugins/platforms/windows/qwindowswindow.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/plugins/platforms/windows/qwindowswindow.cpp b/src/plugins/platforms/windows/qwindowswindow.cpp
index b2ebe06a58..f5cac4d4f0 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)