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

Conflicts:
	.qmake.conf
	examples/quickcontrols2/quickcontrols2.pro
	src/imports/controls/ComboBox.qml
	src/quicktemplates2/qquickabstractbutton.cpp
	src/quicktemplates2/qquickabstractbutton_p.h
	src/quicktemplates2/qquickapplicationwindow_p.h
	src/quicktemplates2/qquickcombobox.cpp
	src/quicktemplates2/qquickcontainer.cpp
	src/quicktemplates2/qquickcontrol.cpp
	src/quicktemplates2/qquickcontrol_p.h
	src/quicktemplates2/qquickcontrol_p_p.h
	src/quicktemplates2/qquicklabel_p.h
	src/quicktemplates2/qquicklabel_p_p.h
	src/quicktemplates2/qquickslider_p.h
	src/quicktemplates2/qquickspinbox.cpp
	src/quicktemplates2/qquicktextarea_p.h
	src/quicktemplates2/qquicktextarea_p_p.h
	src/quicktemplates2/qquicktextfield_p.h
	src/quicktemplates2/qquicktextfield_p_p.h
	tests/auto/auto.pro
	tests/auto/controls/data/tst_combobox.qml

Change-Id: I34cdd5a9794e34e0f38f70353f2a2d04dfc11074

1 files changed, 25 insertions, 4 deletions

diff --git a/src/quicktemplates2/qquickslider.cpp b/src/quicktemplates2/qquickslider.cpp
index b358663d..21aeda39 100644
--- a/src/quicktemplates2/qquickslider.cpp
+++ b/src/quicktemplates2/qquickslider.cpp
@@ -36,6 +36,7 @@
 
 #include "qquickslider_p.h"
 #include "qquickcontrol_p_p.h"
+#include "qquickdeferredexecute_p_p.h"
 
 #include <QtQuick/private/qquickwindow_p.h>
 
@@ -112,6 +113,8 @@ public:
     void handleRelease(const QPointF &point) override;
     void handleUngrab() override;
 
+    void executeHandle(bool complete = false);
+
     qreal from;
     qreal to;
     qreal value;
@@ -122,7 +125,7 @@ public:
     QPointF pressPoint;
     Qt::Orientation orientation;
     QQuickSlider::SnapMode snapMode;
-    QQuickItem *handle;
+    QQuickDeferredPointer<QQuickItem> handle;
 };
 
 qreal QQuickSliderPrivate::snapPosition(qreal position) const
@@ -235,6 +238,20 @@ void QQuickSliderPrivate::handleUngrab()
     q->setPressed(false);
 }
 
+static inline QString handleName() { return QStringLiteral("handle"); }
+
+void QQuickSliderPrivate::executeHandle(bool complete)
+{
+    Q_Q(QQuickSlider);
+    if (handle.wasExecuted())
+        return;
+
+    if (!handle)
+        quickBeginDeferred(q, handleName(), handle);
+    if (complete)
+        quickCompleteDeferred(q, handleName(), handle);
+}
+
 QQuickSlider::QQuickSlider(QQuickItem *parent)
     : QQuickControl(*(new QQuickSliderPrivate), parent)
 {
@@ -517,7 +534,9 @@ void QQuickSlider::setOrientation(Qt::Orientation orientation)
 */
 QQuickItem *QQuickSlider::handle() const
 {
-    Q_D(const QQuickSlider);
+    QQuickSliderPrivate *d = const_cast<QQuickSliderPrivate *>(d_func());
+    if (!d->handle)
+        d->executeHandle();
     return d->handle;
 }
 
@@ -527,11 +546,12 @@ void QQuickSlider::setHandle(QQuickItem *handle)
     if (d->handle == handle)
         return;
 
-    QQuickControlPrivate::destroyDelegate(d->handle, this);
+    delete d->handle;
     d->handle = handle;
     if (handle && !handle->parentItem())
         handle->setParentItem(this);
-    emit handleChanged();
+    if (!d->handle.isExecuting())
+        emit handleChanged();
 }
 
 /*!
@@ -736,6 +756,7 @@ void QQuickSlider::mirrorChange()
 void QQuickSlider::componentComplete()
 {
     Q_D(QQuickSlider);
+    d->executeHandle(true);
     QQuickControl::componentComplete();
     setValue(d->value);
     d->updatePosition();