diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-12-07 09:53:44 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-12-12 20:20:17 +0000 |
| commit | 9b597a09f1b96071fb1e2ee72aafc9dfed76ed14 (patch) | |
| tree | 17165ffab00e3ab53bb3592f7c5177b3f55e6596 /src/gui/kernel | |
| parent | 141bca90e16073086124e542cdb0b91556fe06c5 (diff) | |
QtGui/Windows: Fix wait cursors remaining active
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>
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qwindow.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp index fea55e459d..3e5777ad49 100644 --- a/src/gui/kernel/qwindow.cpp +++ b/src/gui/kernel/qwindow.cpp @@ -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); |