1 files changed, 11 insertions, 5 deletions
diff --git a/src/templates/qquickpopup_p.h b/src/templates/qquickpopup_p.h
index b818ea7f..fa394638 100644
--- a/src/templates/qquickpopup_p.h
+++ b/src/templates/qquickpopup_p.h
@@ -63,6 +63,7 @@
 QT_BEGIN_NAMESPACE
 
 class QQuickItem;
+class QQuickWindow;
 class QQuickPopupPrivate;
 class QQuickTransition;
 class QQuickTransform;
@@ -111,7 +112,7 @@ class Q_LABSTEMPLATES_EXPORT QQuickPopup : public QObject, public QQmlParserStat
     Q_CLASSINFO("DefaultProperty", "contentData")
 
 public:
-    explicit QQuickPopup(QObject *parent = Q_NULLPTR);
+    explicit QQuickPopup(QObject *parent = nullptr);
     ~QQuickPopup();
 
     qreal x() const;
@@ -186,6 +187,7 @@ public:
     void setBottomPadding(qreal padding);
     void resetBottomPadding();
 
+    QQuickWindow *window() const;
     QQuickItem *popupItem() const;
 
     QQuickItem *parentItem() const;
@@ -251,7 +253,8 @@ public:
     QQuickTransition *exit() const;
     void setExit(QQuickTransition *transition);
 
-    QQmlListProperty<QObject> data();
+    bool filtersChildMouseEvents() const;
+    void setFiltersChildMouseEvents(bool filter);
 
 public Q_SLOTS:
     void open();
@@ -300,11 +303,12 @@ Q_SIGNALS:
 protected:
     QQuickPopup(QQuickPopupPrivate &dd, QObject *parent);
 
-    void classBegin() Q_DECL_OVERRIDE;
-    void componentComplete() Q_DECL_OVERRIDE;
+    void classBegin() override;
+    void componentComplete() override;
     bool isComponentComplete() const;
 
-    bool eventFilter(QObject *object, QEvent *event) Q_DECL_OVERRIDE;
+    bool eventFilter(QObject *object, QEvent *event) override;
+    virtual bool childMouseEventFilter(QQuickItem *child, QEvent *event);
     virtual void focusInEvent(QFocusEvent *event);
     virtual void focusOutEvent(QFocusEvent *event);
     virtual void keyPressEvent(QKeyEvent *event);
@@ -314,6 +318,7 @@ protected:
     virtual void mouseReleaseEvent(QMouseEvent *event);
     virtual void mouseDoubleClickEvent(QMouseEvent *event);
     virtual void mouseUngrabEvent();
+    virtual bool overlayEvent(QQuickItem *item, QEvent *event);
     virtual void wheelEvent(QWheelEvent *event);
 
     virtual void contentItemChange(QQuickItem *newItem, QQuickItem *oldItem);
@@ -329,6 +334,7 @@ private:
     Q_DISABLE_COPY(QQuickPopup)
     Q_DECLARE_PRIVATE(QQuickPopup)
     friend class QQuickPopupItem;
+    friend class QQuickOverlay;
 };
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(QQuickPopup::ClosePolicy)