1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QtGui/Windows: Fix wait cursors remaining active

Browse Source 
In QWindowPrivate::applyCursor(), do not apply override cursors
when the platform supports QPlatformCursor::OverrideCursor.

Complements b05d1c2ebfebf0f427a92668c0a7b177d0952012.

Task-number: QTBUG-65001
Change-Id: Ie84cc30ad99b22e037aae829a2ce847ec4bf900f
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
This commit is contained in:
Friedemann Kleint 2017-12-07 09:53:44 +01:00
parent 141bca90e1
commit 9b597a09f1
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/kernel/qwindow.cpp
View File

@ -2790,6 +2790,8 @@ bool QWindowPrivate::applyCursor()
if (!platformWindow)
return true;
QCursor *c = QGuiApplication::overrideCursor();
if (c != nullptr && platformCursor->capabilities().testFlag(QPlatformCursor::OverrideCursor))
return true;
if (!c && hasCursor)
c = &cursor;
platformCursor->changeCursor(c, q);