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

Change-Id: Iba044084bf82f6b2b8ceba4aa2a80bdcf8fc38e0

1 files changed, 9 insertions, 1 deletions

diff --git a/src/quicktemplates2/qquickcombobox.cpp b/src/quicktemplates2/qquickcombobox.cpp
index 04ab559f..d987182c 100644
--- a/src/quicktemplates2/qquickcombobox.cpp
+++ b/src/quicktemplates2/qquickcombobox.cpp
@@ -672,7 +672,15 @@ QQuickComboBox::QQuickComboBox(QQuickItem *parent)
 
 QQuickComboBox::~QQuickComboBox()
 {
-    setPopup(nullptr);
+    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;
 }
 
 /*!