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

Conflicts:
	src/quicktemplates2/qquicklabel.cpp
	src/quicktemplates2/qquicktextarea.cpp
	src/quicktemplates2/qquicktextfield.cpp

Change-Id: Ibbf6bc48972f58fbc6779a87ac9e2434c56c4db8

11 files changed, 61 insertions, 20 deletions

diff --git a/src/quicktemplates2/qquickcontrol.cpp b/src/quicktemplates2/qquickcontrol.cpp
index 6a41aebd..e72df944 100644
--- a/src/quicktemplates2/qquickcontrol.cpp
+++ b/src/quicktemplates2/qquickcontrol.cpp
@@ -690,8 +690,9 @@ void QQuickControl::itemChange(QQuickItem::ItemChange change, const QQuickItem::
             setHovered(false);
 #endif
         break;
+    case ItemSceneChange:
     case ItemParentHasChanged:
-        if (value.item) {
+        if ((change == ItemParentHasChanged && value.item) || (change == ItemSceneChange && value.window)) {
             d->resolveFont();
             d->resolvePalette();
             if (!d->hasLocale)
diff --git a/src/quicktemplates2/qquickdelaybutton.cpp b/src/quicktemplates2/qquickdelaybutton.cpp
index 6e0baf56..128f0c78 100644
--- a/src/quicktemplates2/qquickdelaybutton.cpp
+++ b/src/quicktemplates2/qquickdelaybutton.cpp
@@ -125,7 +125,7 @@ void QQuickDelayTransitionManager::transition(QQuickTransition *transition, qrea
 
 void QQuickDelayTransitionManager::finished()
 {
-    if (qFuzzyCompare(m_button->progress(), 1.0))
+    if (qFuzzyCompare(m_button->progress(), qreal(1.0)))
         emit m_button->activated();
 }
 
@@ -154,7 +154,7 @@ void QQuickDelayButtonPrivate::beginTransition(qreal to)
 void QQuickDelayButtonPrivate::finishTransition()
 {
     Q_Q(QQuickDelayButton);
-    if (qFuzzyCompare(progress, 1.0))
+    if (qFuzzyCompare(progress, qreal(1.0)))
         emit q->activated();
 }
 
@@ -260,7 +260,7 @@ void QQuickDelayButton::buttonChange(ButtonChange change)
 void QQuickDelayButton::nextCheckState()
 {
     Q_D(QQuickDelayButton);
-    setChecked(!d->checked && qFuzzyCompare(d->progress, 1.0));
+    setChecked(!d->checked && qFuzzyCompare(d->progress, qreal(1.0)));
 }
 
 QFont QQuickDelayButton::defaultFont() const
diff --git a/src/quicktemplates2/qquickdial.cpp b/src/quicktemplates2/qquickdial.cpp
index bdbfb22d..93ad0b5a 100644
--- a/src/quicktemplates2/qquickdial.cpp
+++ b/src/quicktemplates2/qquickdial.cpp
@@ -158,7 +158,7 @@ qreal QQuickDialPrivate::positionAt(const QPointF &point) const
 {
     qreal yy = height / 2.0 - point.y();
     qreal xx = point.x() - width / 2.0;
-    qreal angle = (xx || yy) ? atan2(yy, xx) : 0;
+    qreal angle = (xx || yy) ? std::atan2(yy, xx) : 0;
 
     if (angle < M_PI / -2)
         angle = angle + M_PI * 2;
diff --git a/src/quicktemplates2/qquickdrawer.cpp b/src/quicktemplates2/qquickdrawer.cpp
index 96d48f08..328778ca 100644
--- a/src/quicktemplates2/qquickdrawer.cpp
+++ b/src/quicktemplates2/qquickdrawer.cpp
@@ -256,7 +256,7 @@ void QQuickDrawerPrivate::resizeOverlay()
     dimmer->setSize(geometry.size());
 }
 
-static bool isWithinDragMargin(QQuickDrawer *drawer, const QPointF &pos)
+static bool isWithinDragMargin(const QQuickDrawer *drawer, const QPointF &pos)
 {
     switch (drawer->edge()) {
     case Qt::LeftEdge:
@@ -403,6 +403,30 @@ bool QQuickDrawerPrivate::grabTouch(QQuickItem *item, QTouchEvent *event)
 
 static const qreal openCloseVelocityThreshold = 300;
 
+bool QQuickDrawerPrivate::blockInput(QQuickItem *item, const QPointF &point) const
+{
+    Q_Q(const QQuickDrawer);
+
+    // We want all events, if mouse/touch is already grabbed.
+    if (popupItem->keepMouseGrab() || popupItem->keepTouchGrab())
+        return true;
+
+    // Don't block input to drawer's children/content.
+    if (popupItem->isAncestorOf(item))
+        return false;
+
+    // Don't block outside a drawer's background dimming
+    if (dimmer && !dimmer->contains(dimmer->mapFromScene(point)))
+        return false;
+
+    // Accept all events within drag area.
+    if (isWithinDragMargin(q, point))
+        return true;
+
+    // Accept all other events if drawer is modal.
+    return modal;
+}
+
 bool QQuickDrawerPrivate::handlePress(QQuickItem *item, const QPointF &point, ulong timestamp)
 {
     offset = 0;
@@ -421,7 +445,7 @@ bool QQuickDrawerPrivate::handleMove(QQuickItem *item, const QPointF &point, ulo
         return false;
 
     // limit/reset the offset to the edge of the drawer when pushed from the outside
-    if (qFuzzyCompare(position, 1.0) && !contains(point))
+    if (qFuzzyCompare(position, qreal(1.0)) && !contains(point))
         offset = 0;
 
     bool isGrabbed = popupItem->keepMouseGrab() || popupItem->keepTouchGrab();
diff --git a/src/quicktemplates2/qquickdrawer_p_p.h b/src/quicktemplates2/qquickdrawer_p_p.h
index 010f1d49..0ceaf2e7 100644
--- a/src/quicktemplates2/qquickdrawer_p_p.h
+++ b/src/quicktemplates2/qquickdrawer_p_p.h
@@ -79,6 +79,7 @@ public:
 #if QT_CONFIG(quicktemplates2_multitouch)
     bool grabTouch(QQuickItem *item, QTouchEvent *event);
 #endif
+    bool blockInput(QQuickItem *item, const QPointF &point) const override;
 
     bool handlePress(QQuickItem* item, const QPointF &point, ulong timestamp) override;
     bool handleMove(QQuickItem* item, const QPointF &point, ulong timestamp) override;
diff --git a/src/quicktemplates2/qquicklabel.cpp b/src/quicktemplates2/qquicklabel.cpp
index f1a5d15e..724fd086 100644
--- a/src/quicktemplates2/qquicklabel.cpp
+++ b/src/quicktemplates2/qquicklabel.cpp
@@ -315,8 +315,9 @@ void QQuickLabel::itemChange(QQuickItem::ItemChange change, const QQuickItem::It
     case ItemEnabledHasChanged:
         emit paletteChanged();
         break;
+    case ItemSceneChange:
     case ItemParentHasChanged:
-        if (value.item) {
+        if ((change == ItemParentHasChanged && value.item) || (change == ItemSceneChange && value.window)) {
             d->resolveFont();
             d->resolvePalette();
         }
diff --git a/src/quicktemplates2/qquickspinbox.cpp b/src/quicktemplates2/qquickspinbox.cpp
index 69b315b2..714a7ec5 100644
--- a/src/quicktemplates2/qquickspinbox.cpp
+++ b/src/quicktemplates2/qquickspinbox.cpp
@@ -884,8 +884,10 @@ void QQuickSpinBox::componentComplete()
 {
     Q_D(QQuickSpinBox);
     QQuickControl::componentComplete();
-    d->updateUpEnabled();
-    d->updateDownEnabled();
+    if (!d->setValue(d->value, /* modified = */ false, /* allowWrap = */ false)) {
+        d->updateUpEnabled();
+        d->updateDownEnabled();
+    }
 }
 
 void QQuickSpinBox::itemChange(ItemChange change, const ItemChangeData &value)
diff --git a/src/quicktemplates2/qquickswipedelegate.cpp b/src/quicktemplates2/qquickswipedelegate.cpp
index d96e124a..92a5328d 100644
--- a/src/quicktemplates2/qquickswipedelegate.cpp
+++ b/src/quicktemplates2/qquickswipedelegate.cpp
@@ -433,7 +433,7 @@ void QQuickSwipePrivate::beginTransition(qreal newPosition)
 void QQuickSwipePrivate::finishTransition()
 {
     Q_Q(QQuickSwipe);
-    q->setComplete(qFuzzyCompare(qAbs(position), 1.0));
+    q->setComplete(qFuzzyCompare(qAbs(position), qreal(1.0)));
     if (complete)
         emit q->opened();
     else
@@ -693,7 +693,7 @@ void QQuickSwipe::setTransition(QQuickTransition *transition)
 void QQuickSwipe::open(QQuickSwipeDelegate::Side side)
 {
     Q_D(QQuickSwipe);
-    if (qFuzzyCompare(qAbs(d->position), 1.0))
+    if (qFuzzyCompare(qAbs(d->position), qreal(1.0)))
         return;
 
     if ((side != QQuickSwipeDelegate::Left && side != QQuickSwipeDelegate::Right)
diff --git a/src/quicktemplates2/qquicktextarea.cpp b/src/quicktemplates2/qquicktextarea.cpp
index 3c3ed419..19ede665 100644
--- a/src/quicktemplates2/qquicktextarea.cpp
+++ b/src/quicktemplates2/qquicktextarea.cpp
@@ -305,7 +305,7 @@ void QQuickTextAreaPrivate::detachFlickable()
     QObject::disconnect(flickable, &QQuickFlickable::contentXChanged, q, &QQuickItem::update);
     QObject::disconnect(flickable, &QQuickFlickable::contentYChanged, q, &QQuickItem::update);
 
-    QQuickItemPrivate::get(flickable)->updateOrRemoveGeometryChangeListener(this, QQuickGeometryChange::Size);
+    QQuickItemPrivate::get(flickable)->updateOrRemoveGeometryChangeListener(this, QQuickGeometryChange::Nothing);
     QObjectPrivate::disconnect(flickable, &QQuickFlickable::contentWidthChanged, this, &QQuickTextAreaPrivate::resizeFlickableControl);
     QObjectPrivate::disconnect(flickable, &QQuickFlickable::contentHeightChanged, this, &QQuickTextAreaPrivate::resizeFlickableControl);
 
@@ -452,6 +452,13 @@ QQuickTextArea::QQuickTextArea(QQuickItem *parent)
                             d, &QQuickTextAreaPrivate::readOnlyChanged);
 }
 
+QQuickTextArea::~QQuickTextArea()
+{
+    Q_D(QQuickTextArea);
+    if (d->flickable)
+        d->detachFlickable();
+}
+
 QQuickTextAreaAttached *QQuickTextArea::qmlAttachedProperties(QObject *object)
 {
     return new QQuickTextAreaAttached(object);
@@ -698,19 +705,22 @@ void QQuickTextArea::itemChange(QQuickItem::ItemChange change, const QQuickItem:
     case ItemEnabledHasChanged:
         emit paletteChanged();
         break;
+    case ItemSceneChange:
     case ItemParentHasChanged:
-        if (value.item) {
+        if ((change == ItemParentHasChanged && value.item) || (change == ItemSceneChange && value.window)) {
             d->resolveFont();
             d->resolvePalette();
 #if QT_CONFIG(quicktemplates2_hover)
             if (!d->explicitHoverEnabled)
                 d->updateHoverEnabled(QQuickControlPrivate::calcHoverEnabled(d->parentItem), false); // explicit=false
 #endif
-            QQuickFlickable *flickable = qobject_cast<QQuickFlickable *>(value.item->parentItem());
-            if (flickable) {
-                QQuickScrollView *scrollView = qobject_cast<QQuickScrollView *>(flickable->parentItem());
-                if (scrollView)
-                    d->attachFlickable(flickable);
+            if (change == ItemParentHasChanged) {
+                QQuickFlickable *flickable = qobject_cast<QQuickFlickable *>(value.item->parentItem());
+                if (flickable) {
+                    QQuickScrollView *scrollView = qobject_cast<QQuickScrollView *>(flickable->parentItem());
+                    if (scrollView)
+                        d->attachFlickable(flickable);
+                }
             }
         }
         break;
diff --git a/src/quicktemplates2/qquicktextarea_p.h b/src/quicktemplates2/qquicktextarea_p.h
index 6193e3ca..4709d41a 100644
--- a/src/quicktemplates2/qquicktextarea_p.h
+++ b/src/quicktemplates2/qquicktextarea_p.h
@@ -74,6 +74,7 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickTextArea : public QQuickTextEdit
 
 public:
     explicit QQuickTextArea(QQuickItem *parent = nullptr);
+    ~QQuickTextArea();
 
     static QQuickTextAreaAttached *qmlAttachedProperties(QObject *object);
 
diff --git a/src/quicktemplates2/qquicktextfield.cpp b/src/quicktemplates2/qquicktextfield.cpp
index 5033a3cc..189c26be 100644
--- a/src/quicktemplates2/qquicktextfield.cpp
+++ b/src/quicktemplates2/qquicktextfield.cpp
@@ -559,8 +559,9 @@ void QQuickTextField::itemChange(QQuickItem::ItemChange change, const QQuickItem
     case ItemEnabledHasChanged:
         emit paletteChanged();
         break;
+    case ItemSceneChange:
     case ItemParentHasChanged:
-        if (value.item) {
+        if ((change == ItemParentHasChanged && value.item) || (change == ItemSceneChange && value.window)) {
             d->resolveFont();
             d->resolvePalette();
 #if QT_CONFIG(quicktemplates2_hover)