diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-01-02 10:49:24 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-01-02 10:07:45 +0000 |
| commit | 15adf3a6525aec36561d301abeeb782b35833391 (patch) | |
| tree | 980de58d05af147cb141a7afc42d85392150770c /src/gui/kernel | |
| parent | 52b85212a2ec8ec5bf187f6cd00b669a45bcf0bd (diff) | |
QtGui/Windows: Fix restoring of changed cursor in restoreOverrideCursor()
Unconditionally apply window cursors restoreOverrideCursor() also for
platforms with override cursor capability in case
a cursor was changed while the override cursor was active.
Amends b05d1c2ebfebf0f427a92668c0a7b177d0952012.
Task-number: QTBUG-65001
Change-Id: I7fd38a27dcf045f2fb48a16abb484342feaab5df
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qguiapplication.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index 5baadd425f..8996e1d7e6 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -3659,8 +3659,7 @@ void QGuiApplication::restoreOverrideCursor() } else { if (QPlatformCursor::capabilities().testFlag(QPlatformCursor::OverrideCursor)) clearOverrideCursor(QGuiApplicationPrivate::screen_list); - else - applyWindowCursor(QGuiApplicationPrivate::window_list); + applyWindowCursor(QGuiApplicationPrivate::window_list); } } #endif// QT_NO_CURSOR |