Merge remote-tracking branch 'origin/5.12' into dev

 Conflicts:
	.qmake.conf

Change-Id: Ib3b90cce1f4422b308515b06e89b1c4a0bf7f474

2 files changed, 4 insertions, 1 deletions

diff --git a/src/quicktemplates2/qquickpopup.cpp b/src/quicktemplates2/qquickpopup.cpp
index dcced8dc..e542e7e8 100644
--- a/src/quicktemplates2/qquickpopup.cpp
+++ b/src/quicktemplates2/qquickpopup.cpp
@@ -212,6 +212,9 @@ QT_BEGIN_NAMESPACE
 
     \snippet qtquickcontrols2-popup.qml centerIn
 
+    To ensure that the popup is positioned within the bounds of the enclosing
+    window, the \l margins property can be set to a non-negative value.
+
     \sa {Popup Controls}, {Customizing Popup}, ApplicationWindow
 */
 
diff --git a/src/quicktemplates2/qquickpopuppositioner.cpp b/src/quicktemplates2/qquickpopuppositioner.cpp
index 69a57674..ebd8ff29 100644
--- a/src/quicktemplates2/qquickpopuppositioner.cpp
+++ b/src/quicktemplates2/qquickpopuppositioner.cpp
@@ -300,7 +300,7 @@ void QQuickPopupPositioner::addAncestorListeners(QQuickItem *item)
 
     QQuickItem *p = item;
     while (p) {
-        QQuickItemPrivate::get(p)->addItemChangeListener(this, AncestorChangeTypes);
+        QQuickItemPrivate::get(p)->updateOrAddItemChangeListener(this, AncestorChangeTypes);
         p = p->parentItem();
     }
 }