Add PointerHandler.cursorShape property

Also, QQuickItemPrivate::setHasCursorInChild() was unable to check
the QQuickItemPrivate::hasCursor variable, because the function
argument hasCursor was shadowing that, even though the comment
"nope! sorry, I have a cursor myself" hints that the intention
was to check that.  So this change exposed a problem there, and
we have to fix that too, in order to keep the tst_qquickwindow::cursor()
test passing.

[ChangeLog][Event Handlers] Pointer Handlers now have a cursorShape
property to set the cursor when the handler is active and the mouse is
hovering, and restore to the previous cursor when the mouse leaves.

Fixes: QTBUG-68073
Change-Id: Ib5c66bd59c4691c4210ee5465e1c95e7bdcf5ae1
Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>

1 files changed, 5 insertions, 0 deletions

diff --git a/src/quick/items/qquickitem_p.h b/src/quick/items/qquickitem_p.h
index 3c0517cb3b..841d91bb40 100644
--- a/src/quick/items/qquickitem_p.h
+++ b/src/quick/items/qquickitem_p.h
@@ -471,6 +471,7 @@ public:
     bool isTabFence:1;
     bool replayingPressEvent:1;
     bool touchEnabled:1;
+    bool hasCursorHandler:1;
 
     enum DirtyType {
         TransformOrigin         = 0x00000001,
@@ -651,6 +652,10 @@ public:
 
     void setHasCursorInChild(bool hasCursor);
     void setHasHoverInChild(bool hasHover);
+#if QT_CONFIG(cursor)
+    QCursor effectiveCursor(const QQuickPointerHandler *handler) const;
+    QQuickPointerHandler *effectiveCursorHandler() const;
+#endif
 
     virtual void updatePolish() { }
 };