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

Conflicts:
	src/imports/controls/material/qtlabsmaterialstyleplugin.cpp
	src/templates/qquickapplicationwindow_p.h
	src/templates/qquickcombobox.cpp
	src/templates/qquickcombobox_p.h
	src/templates/qquickpopup.cpp

Change-Id: Ibd87e907bc8abf1f675147761ea8bb0b40722478

1 files changed, 32 insertions, 4 deletions

diff --git a/src/templates/qquickpopup_p.h b/src/templates/qquickpopup_p.h
index e94b63f1..233978c8 100644
--- a/src/templates/qquickpopup_p.h
+++ b/src/templates/qquickpopup_p.h
@@ -90,6 +90,8 @@ class Q_LABSTEMPLATES_EXPORT QQuickPopup : public QObject, public QQmlParserStat
     Q_PROPERTY(bool focus READ hasFocus WRITE setFocus NOTIFY focusChanged)
     Q_PROPERTY(bool modal READ isModal WRITE setModal NOTIFY modalChanged)
     Q_PROPERTY(bool visible READ isVisible WRITE setVisible NOTIFY visibleChanged)
+    Q_PROPERTY(ClosePolicy closePolicy READ closePolicy WRITE setClosePolicy NOTIFY closePolicyChanged FINAL)
+    Q_PROPERTY(TransformOrigin transformOrigin READ transformOrigin WRITE setTransformOrigin)
     Q_PROPERTY(QQuickTransition *enter READ enter WRITE setEnter NOTIFY enterChanged FINAL)
     Q_PROPERTY(QQuickTransition *exit READ exit WRITE setExit NOTIFY exitChanged FINAL)
     Q_CLASSINFO("DefaultProperty", "contentData")
@@ -147,6 +149,8 @@ public:
     void setBottomPadding(qreal padding);
     void resetBottomPadding();
 
+    QQuickItem *popupItem() const;
+
     QQuickItem *parentItem() const;
     void setParentItem(QQuickItem *parent);
 
@@ -168,6 +172,31 @@ public:
     bool isVisible() const;
     void setVisible(bool visible);
 
+    enum ClosePolicyFlag {
+        NoAutoClose = 0x00,
+        OnPressOutside = 0x01,
+        OnPressOutsideParent = 0x02,
+        OnReleaseOutside = 0x04,
+        OnReleaseOutsideParent = 0x08,
+        OnEscape = 0x10
+    };
+    Q_DECLARE_FLAGS(ClosePolicy, ClosePolicyFlag)
+    Q_FLAG(ClosePolicy)
+
+    ClosePolicy closePolicy() const;
+    void setClosePolicy(ClosePolicy policy);
+
+    // keep in sync with Item.TransformOrigin
+    enum TransformOrigin {
+        TopLeft, Top, TopRight,
+        Left, Center, Right,
+        BottomLeft, Bottom, BottomRight
+    };
+    Q_ENUM(TransformOrigin)
+
+    TransformOrigin transformOrigin() const;
+    void setTransformOrigin(TransformOrigin);
+
     QQuickTransition *enter() const;
     void setEnter(QQuickTransition *transition);
 
@@ -201,13 +230,10 @@ Q_SIGNALS:
     void focusChanged();
     void modalChanged();
     void visibleChanged();
+    void closePolicyChanged();
     void enterChanged();
     void exitChanged();
 
-    void pressedOutside();
-    void releasedOutside();
-    void clickedOutside();
-
     void aboutToShow();
     void aboutToHide();
 
@@ -239,6 +265,8 @@ private:
     friend class QQuickPopupItem;
 };
 
+Q_DECLARE_OPERATORS_FOR_FLAGS(QQuickPopup::ClosePolicy)
+
 QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(QQuickPopup)