From 15adf3a6525aec36561d301abeeb782b35833391 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 2 Jan 2018 10:49:24 +0100 Subject: 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 --- src/gui/kernel/qguiapplication.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src') 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 -- cgit v1.2.3