Merge remote-tracking branch 'origin/5.7' into 5.8

Conflicts:
	src/imports/controls/material/qquickmaterialstyle.cpp
	src/imports/controls/universal/qquickuniversalstyle.cpp
	src/quicktemplates2/qquickpopup_p_p.h
	src/quicktemplates2/qquicktooltip.cpp
	tests/auto/auto.pro

Change-Id: I88b347dd85278e14f7b2ca468e30648c6432b6f2

1 files changed, 5 insertions, 5 deletions

diff --git a/src/quicktemplates2/qquickpopup_p_p.h b/src/quicktemplates2/qquickpopup_p_p.h
index 342fecaf..4478c555 100644
--- a/src/quicktemplates2/qquickpopup_p_p.h
+++ b/src/quicktemplates2/qquickpopup_p_p.h
@@ -133,10 +133,9 @@ public:
     void setParentItem(QQuickItem *parent);
 
 protected:
-    void itemGeometryChanged(QQuickItem *, QQuickGeometryChange, const QRectF &);
-    void itemParentChanged(QQuickItem *, QQuickItem *parent);
-    void itemChildRemoved(QQuickItem *, QQuickItem *child);
-    void itemDestroyed(QQuickItem *item);
+    void itemGeometryChanged(QQuickItem *, QQuickGeometryChange, const QRectF &) override;
+    void itemParentChanged(QQuickItem *, QQuickItem *parent) override;
+    void itemChildRemoved(QQuickItem *, QQuickItem *child) override;
 
 private:
     void removeAncestorListeners(QQuickItem *item);
@@ -148,7 +147,7 @@ private:
     QQuickPopupPrivate *m_popup;
 };
 
-class QQuickPopupPrivate : public QObjectPrivate
+class QQuickPopupPrivate : public QObjectPrivate, public QQuickItemChangeListener
 {
     Q_DECLARE_PUBLIC(QQuickPopup)
 
@@ -177,6 +176,7 @@ public:
     void setBottomMargin(qreal value, bool reset = false);
 
     void setWindow(QQuickWindow *window);
+    void itemDestroyed(QQuickItem *item) override;
 
     bool focus;
     bool modal;