1 files changed, 60 insertions, 2 deletions
diff --git a/src/quicktemplates2/qquickpopup.cpp b/src/quicktemplates2/qquickpopup.cpp
index b4022247..414ba782 100644
--- a/src/quicktemplates2/qquickpopup.cpp
+++ b/src/quicktemplates2/qquickpopup.cpp
@@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE
 
     \qml
     import QtQuick.Window 2.2
-    import QtQuick.Controls 2.0
+    import QtQuick.Controls 2.1
 
     Window {
         id: window
@@ -533,7 +533,7 @@ void QQuickPopupPositioner::setParentItem(QQuickItem *parent)
         m_popup->reposition();
 }
 
-void QQuickPopupPositioner::itemGeometryChanged(QQuickItem *, const QRectF &, const QRectF &)
+void QQuickPopupPositioner::itemGeometryChanged(QQuickItem *, QQuickGeometryChange, const QRectF &)
 {
     if (m_parentItem && m_popup->popupItem->isVisible())
         m_popup->reposition();
@@ -1330,6 +1330,64 @@ void QQuickPopup::resetBottomPadding()
 }
 
 /*!
+    \since QtQuick.Controls 2.1
+    \qmlproperty bool QtQuick.Controls::Popup::allowVerticalFlip
+
+    This property holds whether the popup is allowed to flip vertically.
+
+    A popup can be flipped from above its parent item to below it, or vice
+    versa, in order to make the popup fit inside the window.
+
+    The default value is \c false.
+
+    \sa allowHorizontalFlip
+*/
+bool QQuickPopup::allowVerticalFlip() const
+{
+    Q_D(const QQuickPopup);
+    return d->allowVerticalFlip;
+}
+
+void QQuickPopup::setAllowVerticalFlip(bool allow)
+{
+    Q_D(QQuickPopup);
+    if (d->allowVerticalFlip == allow)
+        return;
+
+    d->allowVerticalFlip = allow;
+    emit allowVerticalFlipChanged();
+}
+
+/*!
+    \since QtQuick.Controls 2.1
+    \qmlproperty bool QtQuick.Controls::Popup::allowHorizontalFlip
+
+    This property holds whether the popup is allowed to flip horizontally.
+
+    A popup can be flipped from the left side of its parent item to the right
+    side, or vice versa, in order to make the popup fit inside the window.
+
+    The default value is \c false.
+
+    \sa allowVerticalFlip
+*/
+bool QQuickPopup::allowHorizontalFlip() const
+{
+    Q_D(const QQuickPopup);
+    return d->allowHorizontalFlip;
+}
+
+void QQuickPopup::setAllowHorizontalFlip(bool allow)
+{
+    Q_D(QQuickPopup);
+    if (d->allowHorizontalFlip == allow)
+        return;
+
+    d->allowHorizontalFlip = allow;
+    emit allowHorizontalFlipChanged();
+}
+
+/*!
     \qmlproperty Locale QtQuick.Controls::Popup::locale
 
     This property holds the locale of the popup.