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

Conflicts:
	.qmake.conf
	src/quicktemplates2/qquickbuttongroup.cpp
	src/quicktemplates2/qquickoverlay.cpp
	tests/auto/controls/data/tst_buttongroup.qml

Change-Id: Iae23aaf039c6095007966475294e93220dbead84

1 files changed, 32 insertions, 0 deletions

diff --git a/tests/auto/controls/data/tst_buttongroup.qml b/tests/auto/controls/data/tst_buttongroup.qml
index cbbaec5a..7d981dd3 100644
--- a/tests/auto/controls/data/tst_buttongroup.qml
+++ b/tests/auto/controls/data/tst_buttongroup.qml
@@ -402,4 +402,36 @@ TestCase {
         compare(button2.checked, true)
         compare(group.checkedButton, null)
     }
+
+    Component {
+        id: checkedButtonColumn
+        Column {
+            id: column
+            ButtonGroup { buttons: column.children }
+            Repeater {
+                id: repeater
+                delegate: Button {
+                    checkable: true
+                    text: modelData
+                    onClicked: listModel.remove(index)
+                }
+                model: ListModel {
+                    id: listModel
+                    Component.onCompleted: {
+                        for (var i = 0; i < 10; ++i)
+                            append({text: i})
+                    }
+                }
+            }
+        }
+    }
+
+    function test_checkedButtonDestroyed() {
+        var column = createTemporaryObject(checkedButtonColumn, testCase)
+        verify(column)
+
+        waitForRendering(column)
+        mouseClick(column.children[0])
+        wait(0) // don't crash (QTBUG-62946, QTBUG-63470)
+    }
 }