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

Conflicts:
	src/quickcontrols2/qquickchecklabel.cpp
	src/quickcontrols2/qquickchecklabel_p.h
	src/quickcontrols2/qquickmnemoniclabel_p.h
	src/quicktemplates2/qquickbuttongroup_p.h
	src/quicktemplates2/qquickspinbox.cpp
	src/quicktemplates2/qquickswipedelegate.cpp

Change-Id: I1278b78dcaf25be5698f34751193b83dc951eb3c

1 files changed, 18 insertions, 18 deletions

diff --git a/src/quicktemplates2/qquickspinbox.cpp b/src/quicktemplates2/qquickspinbox.cpp
index 4f57c305..588944af 100644
--- a/src/quicktemplates2/qquickspinbox.cpp
+++ b/src/quicktemplates2/qquickspinbox.cpp
@@ -197,7 +197,7 @@ void QQuickSpinBoxPrivate::updateValue()
             } else {
                 val = locale.toInt(text.toString());
             }
-            setValue(val, /* modified = */ true, /* allowWrap = */ false);
+            setValue(val, /* allowWrap = */ false, /* modified = */ true);
         }
     }
 }
@@ -938,7 +938,7 @@ void QQuickSpinBox::componentComplete()
 {
     Q_D(QQuickSpinBox);
     QQuickControl::componentComplete();
-    if (!d->setValue(d->value, /* modified = */ false, /* allowWrap = */ false)) {
+    if (!d->setValue(d->value, /* allowWrap = */ false, /* modified = */ false)) {
         d->updateDisplayText();
         d->updateUpEnabled();
         d->updateDownEnabled();
@@ -1040,22 +1040,6 @@ void QQuickSpinButton::setPressed(bool pressed)
     emit pressedChanged();
 }
 
-bool QQuickSpinButton::isHovered() const
-{
-    Q_D(const QQuickSpinButton);
-    return d->hovered;
-}
-
-void QQuickSpinButton::setHovered(bool hovered)
-{
-    Q_D(QQuickSpinButton);
-    if (d->hovered == hovered)
-        return;
-
-    d->hovered = hovered;
-    emit hoveredChanged();
-}
-
 QQuickItem *QQuickSpinButton::indicator() const
 {
     Q_D(const QQuickSpinButton);
@@ -1078,4 +1062,20 @@ void QQuickSpinButton::setIndicator(QQuickItem *indicator)
     emit indicatorChanged();
 }
 
+bool QQuickSpinButton::isHovered() const
+{
+    Q_D(const QQuickSpinButton);
+    return d->hovered;
+}
+
+void QQuickSpinButton::setHovered(bool hovered)
+{
+    Q_D(QQuickSpinButton);
+    if (d->hovered == hovered)
+        return;
+
+    d->hovered = hovered;
+    emit hoveredChanged();
+}
+
 QT_END_NAMESPACE