diff options
author | Liang Qi <liang.qi@qt.io> | 2018-01-04 19:49:26 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-01-04 19:49:26 +0100 |
commit | 79dfc084375e52dde283e6b046b5894198e9f6a2 (patch) | |
tree | 564ecca27993eafb920fa7597adb23c28132081e /src/gui/kernel/qguiapplication.cpp | |
parent | 6efbd4381ade816515bbde59f9d31df0241e1340 (diff) | |
parent | 952c4fa25180e5f6180067bc8edd2abe6d81d053 (diff) |
Merge remote-tracking branch 'origin/5.10' into dev
Change-Id: I644cd82b0d952b7d139e0228bf5017f147db77e7
Diffstat (limited to 'src/gui/kernel/qguiapplication.cpp')
-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 b7c61779e6..8149fa3905 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -3751,8 +3751,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 |