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, 17 insertions, 4 deletions

diff --git a/src/quicktemplates2/qquickcontrol.cpp b/src/quicktemplates2/qquickcontrol.cpp
index 84f7a6cf..20de449e 100644
--- a/src/quicktemplates2/qquickcontrol.cpp
+++ b/src/quicktemplates2/qquickcontrol.cpp
@@ -766,10 +766,13 @@ qreal QQuickControl::spacing() const
 void QQuickControl::setSpacing(qreal spacing)
 {
     Q_D(QQuickControl);
-    if (!qFuzzyCompare(d->spacing, spacing)) {
-        d->spacing = spacing;
-        emit spacingChanged();
-    }
+    if (qFuzzyCompare(d->spacing, spacing))
+        return;
+
+    qreal oldSpacing = d->spacing;
+    d->spacing = spacing;
+    emit spacingChanged();
+    spacingChange(spacing, oldSpacing);
 }
 
 void QQuickControl::resetSpacing()
@@ -1012,6 +1015,10 @@ void QQuickControl::setHovered(bool hovered)
     Setting this property propagates the value to all child controls that do not have
     \c hoverEnabled explicitly set.
 
+    You can also enable or disable hover effects for all Qt Quick Controls 2 applications
+    by setting the \c QT_QUICK_CONTROLS_HOVER_ENABLED \l {Supported Environment Variables
+    in Qt Quick Controls 2}{environment variable}.
+
     \sa hovered
 */
 bool QQuickControl::isHoverEnabled() const
@@ -1287,6 +1294,12 @@ void QQuickControl::mirrorChange()
     emit mirroredChanged();
 }
 
+void QQuickControl::spacingChange(qreal newSpacing, qreal oldSpacing)
+{
+    Q_UNUSED(newSpacing);
+    Q_UNUSED(oldSpacing);
+}
+
 void QQuickControl::paddingChange(const QMarginsF &newPadding, const QMarginsF &oldPadding)
 {
     Q_D(QQuickControl);