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, 2 insertions, 6 deletions

diff --git a/src/quicktemplates2/qquickbuttongroup.cpp b/src/quicktemplates2/qquickbuttongroup.cpp
index ef35440f57..2a1e354ced 100644
--- a/src/quicktemplates2/qquickbuttongroup.cpp
+++ b/src/quicktemplates2/qquickbuttongroup.cpp
@@ -154,11 +154,7 @@ class QQuickButtonGroupPrivate : public QObjectPrivate
     Q_DECLARE_PUBLIC(QQuickButtonGroup)
 
 public:
-    QQuickButtonGroupPrivate()
-        : exclusive(true),
-          checkedButton(nullptr)
-    {
-    }
+    QQuickButtonGroupPrivate() : exclusive(true) { }
 
     void clear();
     void buttonClicked();
@@ -170,7 +166,7 @@ public:
     static void buttons_clear(QQmlListProperty<QQuickAbstractButton> *prop);
 
     bool exclusive;
-    QQuickAbstractButton *checkedButton;
+    QPointer<QQuickAbstractButton> checkedButton;
     QVector<QQuickAbstractButton*> buttons;
 };