diff --git a/src/quick/util/qquickdeliveryagent.cpp b/src/quick/util/qquickdeliveryagent.cpp
index 0ff4f763fc..0c734b1521 100644
--- a/src/quick/util/qquickdeliveryagent.cpp
+++ b/src/quick/util/qquickdeliveryagent.cpp
@@ -2077,7 +2077,7 @@ void QQuickDeliveryAgentPrivate::deliverPointerEvent(QPointerEvent *event)
 */
 // FIXME: should this be iterative instead of recursive?
 QVector<QQuickItem *> QQuickDeliveryAgentPrivate::eventTargets(QQuickItem *item, const QEvent *event, QPointF scenePos,
-                                                               std::function<std::optional<bool>(QQuickItem *item, const QEvent *event)> predicate) const
+                                                               qxp::function_ref<std::optional<bool> (QQuickItem *, const QEvent *)> predicate) const
 {
     QVector<QQuickItem *> targets;
     auto itemPrivate = QQuickItemPrivate::get(item);
@@ -2089,13 +2089,9 @@ QVector<QQuickItem *> QQuickDeliveryAgentPrivate::eventTargets(QQuickItem *item,
             return targets;
     }
     QList<QQuickItem *> children = itemPrivate->paintOrderChildItems();
-    if (predicate) {
-        const auto override = predicate(item, event);
-        if (override == true)
-            relevant = true;
-        else if (override == false)
-            relevant = false;
-    }
+    const std::optional<bool> override = predicate(item, event);
+    if (override.has_value())
+        relevant = override.value();
     if (relevant) {
         auto it = std::lower_bound(children.begin(), children.end(), 0,
            [](auto lhs, auto rhs) -> bool { return lhs->z() < rhs; });
@@ -2940,7 +2936,11 @@ bool QQuickDeliveryAgentPrivate::dragOverThreshold(QVector2D delta)
 */
 QVector<QQuickItem *> QQuickDeliveryAgentPrivate::contextMenuTargets(QQuickItem *item, const QContextMenuEvent *event) const
 {
-    return eventTargets(item, event, event->pos(), nullptr);
+    auto predicate = [](QQuickItem *, const QEvent *) -> std::optional<bool> {
+        return std::nullopt;
+    };
+
+    return eventTargets(item, event, event->pos(), predicate);
 }
 
 /*!
diff --git a/src/quick/util/qquickdeliveryagent_p_p.h b/src/quick/util/qquickdeliveryagent_p_p.h
index c937765e8a..d77fc44bee 100644
--- a/src/quick/util/qquickdeliveryagent_p_p.h
+++ b/src/quick/util/qquickdeliveryagent_p_p.h
@@ -18,6 +18,7 @@
 #include <QtQuick/private/qquickdeliveryagent_p.h>
 #include <QtGui/qevent.h>
 #include <QtCore/qstack.h>
+#include <QtCore/qxpfunctional.h>
 
 #include <private/qevent_p.h>
 #include <private/qpointingdevice_p.h>
@@ -166,7 +167,7 @@ public:
     void deliverUpdatedPoints(QPointerEvent *event);
     void deliverMatchingPointsToItem(QQuickItem *item, bool isGrabber, QPointerEvent *pointerEvent, bool handlersOnly = false);
 
-    QVector<QQuickItem *> eventTargets(QQuickItem *, const QEvent *event, QPointF scenePos,  std::function<std::optional<bool> (QQuickItem *, const QEvent *)> predicate) const;
+    QVector<QQuickItem *> eventTargets(QQuickItem *, const QEvent *event, QPointF scenePos, qxp::function_ref<std::optional<bool> (QQuickItem *, const QEvent *)> predicate) const;
     QVector<QQuickItem *> pointerTargets(QQuickItem *, const QPointerEvent *event, const QEventPoint &point,
                                          bool checkMouseButtons, bool checkAcceptsTouch) const;
     QVector<QQuickItem *> mergePointerTargets(const QVector<QQuickItem *> &list1, const QVector<QQuickItem *> &list2) const;