1 files changed, 69 insertions, 27 deletions

diff --git a/src/quicktemplates2/qquickcombobox.cpp b/src/quicktemplates2/qquickcombobox.cpp
index 6b20e6a5..3b37900d 100644
--- a/src/quicktemplates2/qquickcombobox.cpp
+++ b/src/quicktemplates2/qquickcombobox.cpp
@@ -39,6 +39,7 @@
 #include "qquickabstractbutton_p.h"
 #include "qquickabstractbutton_p_p.h"
 #include "qquickpopup_p_p.h"
+#include "qquickdeferredexecute_p_p.h"
 
 #include <QtCore/qregexp.h>
 #include <QtCore/qabstractitemmodel.h>
@@ -255,6 +256,9 @@ public:
     void handleRelease(const QPointF &point) override;
     void handleUngrab() override;
 
+    void executeIndicator(bool complete = false);
+    void executePopup(bool complete = false);
+
     bool flat;
     bool down;
     bool hasDown;
@@ -272,8 +276,8 @@ public:
     QQuickItem *pressedItem;
     QQmlInstanceModel *delegateModel;
     QQmlComponent *delegate;
-    QQuickItem *indicator;
-    QQuickPopup *popup;
+    QQuickDeferredPointer<QQuickItem> indicator;
+    QQuickDeferredPointer<QQuickPopup> popup;
 
     struct ExtraData {
         ExtraData()
@@ -318,6 +322,9 @@ bool QQuickComboBoxPrivate::isPopupVisible() const
 
 void QQuickComboBoxPrivate::showPopup()
 {
+    if (!popup)
+        executePopup(true);
+
     if (popup && !popup->isVisible())
         popup->open();
 }
@@ -335,13 +342,10 @@ void QQuickComboBoxPrivate::hidePopup(bool accept)
 
 void QQuickComboBoxPrivate::togglePopup(bool accept)
 {
-    if (!popup)
-        return;
-
-    if (popup->isVisible())
-        hidePopup(accept);
-    else
+    if (!popup || !popup->isVisible())
         showPopup();
+    else
+        hidePopup(accept);
 }
 
 void QQuickComboBoxPrivate::popupVisibleChanged()
@@ -398,8 +402,11 @@ void QQuickComboBoxPrivate::createdItem(int index, QObject *object)
 {
     Q_Q(QQuickComboBox);
     QQuickItem *item = qobject_cast<QQuickItem *>(object);
-    if (popup && item && !item->parentItem()) {
-        item->setParentItem(popup->contentItem());
+    if (item && !item->parentItem()) {
+        if (popup)
+            item->setParentItem(popup->contentItem());
+        else
+            item->setParentItem(q);
         QQuickItemPrivate::get(item)->setCulled(true);
     }
 
@@ -695,6 +702,34 @@ void QQuickComboBoxPrivate::handleUngrab()
     q->setPressed(false);
 }
 
+static inline QString indicatorName() { return QStringLiteral("indicator"); }
+
+void QQuickComboBoxPrivate::executeIndicator(bool complete)
+{
+    Q_Q(QQuickComboBox);
+    if (indicator.wasExecuted())
+        return;
+
+    if (!indicator)
+        quickBeginDeferred(q, indicatorName(), indicator);
+    if (complete)
+        quickCompleteDeferred(q, indicatorName(), indicator);
+}
+
+static inline QString popupName() { return QStringLiteral("popup"); }
+
+void QQuickComboBoxPrivate::executePopup(bool complete)
+{
+    Q_Q(QQuickComboBox);
+    if (popup.wasExecuted())
+        return;
+
+    if (!popup)
+        quickBeginDeferred(q, popupName(), popup);
+    if (complete)
+        quickCompleteDeferred(q, popupName(), popup);
+}
+
 QQuickComboBox::QQuickComboBox(QQuickItem *parent)
     : QQuickControl(*(new QQuickComboBoxPrivate), parent)
 {
@@ -710,14 +745,13 @@ QQuickComboBox::QQuickComboBox(QQuickItem *parent)
 QQuickComboBox::~QQuickComboBox()
 {
     Q_D(QQuickComboBox);
-    // Disconnect visibleChanged() to avoid a spurious highlightedIndexChanged() signal
-    // emission during the destruction of the (visible) popup. (QTBUG-57650)
-    QObjectPrivate::disconnect(d->popup, &QQuickPopup::visibleChanged, d, &QQuickComboBoxPrivate::popupVisibleChanged);
-
-    // Delete the popup directly instead of calling setPopup(nullptr) to avoid calling
-    // destroyDelegate(popup) and potentially accessing a destroyed QML context. (QTBUG-50992)
-    delete d->popup;
-    d->popup = nullptr;
+    if (d->popup) {
+        // Disconnect visibleChanged() to avoid a spurious highlightedIndexChanged() signal
+        // emission during the destruction of the (visible) popup. (QTBUG-57650)
+        QObjectPrivate::disconnect(d->popup.data(), &QQuickPopup::visibleChanged, d, &QQuickComboBoxPrivate::popupVisibleChanged);
+        delete d->popup;
+        d->popup = nullptr;
+    }
 }
 
 /*!
@@ -1002,7 +1036,9 @@ void QQuickComboBox::setDelegate(QQmlComponent* delegate)
 */
 QQuickItem *QQuickComboBox::indicator() const
 {
-    Q_D(const QQuickComboBox);
+    QQuickComboBoxPrivate *d = const_cast<QQuickComboBoxPrivate *>(d_func());
+    if (!d->indicator)
+        d->executeIndicator();
     return d->indicator;
 }
 
@@ -1012,13 +1048,14 @@ void QQuickComboBox::setIndicator(QQuickItem *indicator)
     if (d->indicator == indicator)
         return;
 
-    QQuickControlPrivate::destroyDelegate(d->indicator, this);
+    delete d->indicator;
     d->indicator = indicator;
     if (indicator) {
         if (!indicator->parentItem())
             indicator->setParentItem(this);
     }
-    emit indicatorChanged();
+    if (!d->indicator.isExecuting())
+        emit indicatorChanged();
 }
 
 /*!
@@ -1036,7 +1073,9 @@ void QQuickComboBox::setIndicator(QQuickItem *indicator)
 */
 QQuickPopup *QQuickComboBox::popup() const
 {
-    Q_D(const QQuickComboBox);
+    QQuickComboBoxPrivate *d = const_cast<QQuickComboBoxPrivate *>(d_func());
+    if (!d->popup)
+        d->executePopup(isComponentComplete());
     return d->popup;
 }
 
@@ -1047,8 +1086,8 @@ void QQuickComboBox::setPopup(QQuickPopup *popup)
         return;
 
     if (d->popup) {
-        QObjectPrivate::disconnect(d->popup, &QQuickPopup::visibleChanged, d, &QQuickComboBoxPrivate::popupVisibleChanged);
-        QQuickControlPrivate::destroyDelegate(d->popup, this);
+        QObjectPrivate::disconnect(d->popup.data(), &QQuickPopup::visibleChanged, d, &QQuickComboBoxPrivate::popupVisibleChanged);
+        delete d->popup;
     }
     if (popup) {
         QQuickPopupPrivate::get(popup)->allowVerticalFlip = true;
@@ -1059,7 +1098,8 @@ void QQuickComboBox::setPopup(QQuickPopup *popup)
             itemView->setHighlightRangeMode(QQuickItemView::NoHighlightRange);
     }
     d->popup = popup;
-    emit popupChanged();
+    if (!d->popup.isExecuting())
+        emit popupChanged();
 }
 
 /*!
@@ -1537,9 +1577,8 @@ void QQuickComboBox::keyReleaseEvent(QKeyEvent *event)
 {
     Q_D(QQuickComboBox);
     QQuickControl::keyReleaseEvent(event);
-
     d->keyNavigating = false;
-    if (!d->popup || event->isAutoRepeat())
+    if (event->isAutoRepeat())
         return;
 
     switch (event->key()) {
@@ -1586,6 +1625,9 @@ void QQuickComboBox::wheelEvent(QWheelEvent *event)
 void QQuickComboBox::componentComplete()
 {
     Q_D(QQuickComboBox);
+    d->executeIndicator(true);
+    if (d->popup)
+        d->executePopup(true);
     QQuickControl::componentComplete();
 
     if (d->delegateModel && d->ownModel)