Show widget cursor after restoring last override cursor
authorMiikka Heikkinen <miikka.heikkinen@digia.com>
Wed, 3 Oct 2012 09:06:14 +0000 (12:06 +0300)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Thu, 4 Oct 2012 07:13:33 +0000 (09:13 +0200)
commit8547205fe882819af9eb4cdd024404ab3b9ad0dc
tree6561aa30cd0276fe281cb8a27455f3d04b376376
parentb4bf76fffce4dfac1363d83a823a5f26541cd929
Show widget cursor after restoring last override cursor

qwidget_qpa.cpp was setting cursor directly to platform window, so
QWindow didn't actually know what cursor was supposed to be shown.

Since QWindow now supports setting cursor and has override cursor
handling there, set cursor via QWindow instead of platform window.
Also changed QGuiApplication override cursor handling so that
it will query the cursor from QWindow if there is no override cursor.
With these changes, widget's custom cursor will be properly shown
when final override cursor is restored.

Task-number: QTBUG-24674
Change-Id: I2d2bb1027779256f9d6de560b6533f45e205ffe9
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
src/gui/kernel/qguiapplication.cpp
src/widgets/kernel/qwidget_qpa.cpp