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

Conflicts:
	src/quicktemplates2/qquickpopup.cpp
	src/quicktemplates2/qquickpopup_p_p.h

Change-Id: I33241dfd15a320e6ae2f0c056252b0ec6be7c6f6

1 files changed, 37 insertions, 0 deletions

diff --git a/src/quicktemplates2/qquickpopup.cpp b/src/quicktemplates2/qquickpopup.cpp
index 13dd1a4d..a7927d19 100644
--- a/src/quicktemplates2/qquickpopup.cpp
+++ b/src/quicktemplates2/qquickpopup.cpp
@@ -123,6 +123,7 @@ QQuickPopupPrivate::QQuickPopupPrivate()
     , hasDim(false)
     , visible(false)
     , complete(false)
+    , positioning(false)
     , hasWidth(false)
     , hasHeight(false)
     , hasTopMargin(false)
@@ -717,6 +718,35 @@ qreal QQuickPopup::availableHeight() const
 }
 
 /*!
+    \since QtQuick.Controls 2.1
+    \qmlproperty real QtQuick.Controls::Popup::spacing
+
+    This property holds the spacing.
+
+    Spacing is useful for popups that have multiple or repetitive building
+    blocks. For example, some styles use spacing to determine the distance
+    between the header, content, and footer of \l Dialog. Spacing is not
+    enforced by Popup, so each style may interpret it differently, and some
+    may ignore it altogether.
+*/
+qreal QQuickPopup::spacing() const
+{
+    Q_D(const QQuickPopup);
+    return d->popupItem->spacing();
+}
+
+void QQuickPopup::setSpacing(qreal spacing)
+{
+    Q_D(QQuickPopup);
+    d->popupItem->setSpacing(spacing);
+}
+
+void QQuickPopup::resetSpacing()
+{
+    setSpacing(0);
+}
+
+/*!
     \qmlproperty real QtQuick.Controls::Popup::margins
 
     This property holds the default margins around the popup.
@@ -1740,6 +1770,13 @@ void QQuickPopup::paddingChange(const QMarginsF &newPadding, const QMarginsF &ol
         emit availableHeightChanged();
 }
 
+void QQuickPopup::spacingChange(qreal newSpacing, qreal oldSpacing)
+{
+    Q_UNUSED(newSpacing);
+    Q_UNUSED(oldSpacing);
+    emit spacingChanged();
+}
+
 QFont QQuickPopup::defaultFont() const
 {
     return QQuickControlPrivate::themeFont(QPlatformTheme::SystemFont);