1 files changed, 20 insertions, 4 deletions
diff --git a/src/quick/items/qquickitem_p.h b/src/quick/items/qquickitem_p.h
index 0204ac07c5..11b47114cf 100644
--- a/src/quick/items/qquickitem_p.h
+++ b/src/quick/items/qquickitem_p.h
@@ -280,6 +280,7 @@ public:
     QQuickItemLayer *layer() const;
 
     bool hasPointerHandlers() const;
+    bool hasHoverHandlers() const;
 
     // data property
     static void data_append(QQmlListProperty<QObject> *, QObject *);
@@ -330,12 +331,26 @@ public:
     Q_DECLARE_FLAGS(ChangeTypes, ChangeType)
 
     struct ChangeListener {
-        ChangeListener(QQuickItemChangeListener *l = nullptr, QQuickItemPrivate::ChangeTypes t = nullptr) : listener(l), types(t), gTypes(QQuickGeometryChange::All) {}
-        ChangeListener(QQuickItemChangeListener *l, QQuickGeometryChange gt) : listener(l), types(Geometry), gTypes(gt) {}
+        using ChangeTypes = QQuickItemPrivate::ChangeTypes;
+
+        ChangeListener(QQuickItemChangeListener *l = nullptr, ChangeTypes t = nullptr)
+            : listener(l)
+            , types(t)
+            , gTypes(QQuickGeometryChange::All)
+        {}
+
+        ChangeListener(QQuickItemChangeListener *l, QQuickGeometryChange gt)
+            : listener(l)
+            , types(Geometry)
+            , gTypes(gt)
+        {}
+
+        bool operator==(const ChangeListener &other) const
+        { return listener == other.listener && types == other.types; }
+
         QQuickItemChangeListener *listener;
-        QQuickItemPrivate::ChangeTypes types;
+        ChangeTypes types;
         QQuickGeometryChange gTypes;  //NOTE: not used for ==
-        bool operator==(const ChangeListener &other) const { return listener == other.listener && types == other.types; }
     };
 
     struct ExtraData {
@@ -582,6 +597,7 @@ public:
 #endif
     void deliverShortcutOverrideEvent(QKeyEvent *);
 
+    bool anyPointerHandlerWants(QQuickEventPoint *point) const;
     virtual bool handlePointerEvent(QQuickPointerEvent *, bool avoidExclusiveGrabber = false);
 
     virtual void setVisible(bool visible);