diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-08-19 09:47:35 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-08-19 09:47:35 +0200 |
| commit | d2628d9d7015e4b75007471d150acedecaa0c6c1 (patch) | |
| tree | 00ab012c7ae190d5a64788ee945ca006e3759e41 /src/quick/items/qquickitem.cpp | |
| parent | b6a6a6387e279c431d520243345530fa19bd96c5 (diff) | |
| parent | 566afc2d2e4156712ffec081715f12307cf46628 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
tests/auto/quick/qquickgridview/qquickgridview.pro
tests/auto/quick/qquickitem/qquickitem.pro
Change-Id: Ic54cafbdda1ac22757d2ee65dcc63a1b167c7556
Diffstat (limited to 'src/quick/items/qquickitem.cpp')
| -rw-r--r-- | src/quick/items/qquickitem.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp index ce23b99e8c..a7c7416b5f 100644 --- a/src/quick/items/qquickitem.cpp +++ b/src/quick/items/qquickitem.cpp @@ -2568,8 +2568,10 @@ void QQuickItemPrivate::derefWindow() if (c->mouseGrabberItem == q) c->mouseGrabberItem = 0; #ifndef QT_NO_CURSOR - if (c->cursorItem == q) + if (c->cursorItem == q) { c->cursorItem = 0; + window->unsetCursor(); + } #endif c->hoverItems.removeAll(q); if (itemNodeInstance) |