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

diff --git a/src/quicktemplates2/qquickgroupbox.cpp b/src/quicktemplates2/qquickgroupbox.cpp
index c227afdc..c127192c 100644
--- a/src/quicktemplates2/qquickgroupbox.cpp
+++ b/src/quicktemplates2/qquickgroupbox.cpp
@@ -36,6 +36,7 @@
 
 #include "qquickgroupbox_p.h"
 #include "qquickframe_p_p.h"
+#include "qquickdeferredexecute_p_p.h"
 
 #include <QtGui/qpa/qplatformtheme.h>
 
@@ -85,13 +86,31 @@ QT_BEGIN_NAMESPACE
 
 class QQuickGroupBoxPrivate : public QQuickFramePrivate
 {
+    Q_DECLARE_PUBLIC(QQuickGroupBox)
+
 public:
     QQuickGroupBoxPrivate() : label(nullptr) { }
 
+    void executeLabel(bool complete = false);
+
     QString title;
-    QQuickItem *label;
+    QQuickDeferredPointer<QQuickItem> label;
 };
 
+static inline QString labelName() { return QStringLiteral("label"); }
+
+void QQuickGroupBoxPrivate::executeLabel(bool complete)
+{
+    Q_Q(QQuickGroupBox);
+    if (label.wasExecuted())
+        return;
+
+    if (!label)
+        quickBeginDeferred(q, labelName(), label);
+    if (complete)
+        quickCompleteDeferred(q, labelName(), label);
+}
+
 QQuickGroupBox::QQuickGroupBox(QQuickItem *parent)
     : QQuickFrame(*(new QQuickGroupBoxPrivate), parent)
 {
@@ -131,7 +150,9 @@ void QQuickGroupBox::setTitle(const QString &title)
 */
 QQuickItem *QQuickGroupBox::label() const
 {
-    Q_D(const QQuickGroupBox);
+    QQuickGroupBoxPrivate *d = const_cast<QQuickGroupBoxPrivate *>(d_func());
+    if (!d->label)
+        d->executeLabel();
     return d->label;
 }
 
@@ -141,11 +162,19 @@ void QQuickGroupBox::setLabel(QQuickItem *label)
     if (d->label == label)
         return;
 
-    QQuickControlPrivate::destroyDelegate(d->label, this);
+    delete d->label;
     d->label = label;
     if (label && !label->parentItem())
         label->setParentItem(this);
-    emit labelChanged();
+    if (!d->label.isExecuting())
+        emit labelChanged();
+}
+
+void QQuickGroupBox::componentComplete()
+{
+    Q_D(QQuickGroupBox);
+    d->executeLabel(true);
+    QQuickFrame::componentComplete();
 }
 
 QFont QQuickGroupBox::defaultFont() const