Merge remote-tracking branch 'origin/5.15' into dev

 Conflicts:
	src/widgets/widgets/qabstractbutton.cpp
	src/widgets/widgets/qbuttongroup.cpp
	src/widgets/widgets/qbuttongroup.h
	src/widgets/widgets/qsplashscreen.cpp
	tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp
        tests/benchmarks/opengl/main.cpp

  Needed update:
	src/plugins/platforms/cocoa/CMakeLists.txt

Change-Id: I7be4baebb63844ec2b3e0de859ca9de1bc730bb5

1 files changed, 40 insertions, 1 deletions

diff --git a/src/widgets/widgets/qbuttongroup.cpp b/src/widgets/widgets/qbuttongroup.cpp
index 1368c721ad..8ed343177d 100644
--- a/src/widgets/widgets/qbuttongroup.cpp
+++ b/src/widgets/widgets/qbuttongroup.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtWidgets module of the Qt Toolkit.
@@ -163,6 +163,16 @@ void QButtonGroup::setExclusive(bool exclusive)
 */
 
 /*!
+    \fn void QButtonGroup::idClicked(int id)
+    \since 5.15
+
+    This signal is emitted when a button with the given \a id is
+    clicked.
+
+    \sa checkedButton(), QAbstractButton::clicked()
+*/
+
+/*!
     \fn void QButtonGroup::buttonPressed(QAbstractButton *button)
     \since 4.2
 
@@ -172,6 +182,16 @@ void QButtonGroup::setExclusive(bool exclusive)
 */
 
 /*!
+    \fn void QButtonGroup::idPressed(int id)
+    \since 5.15
+
+    This signal is emitted when a button with the given \a id is
+    pressed down.
+
+    \sa QAbstractButton::pressed()
+*/
+
+/*!
     \fn void QButtonGroup::buttonReleased(QAbstractButton *button)
     \since 4.2
 
@@ -181,6 +201,16 @@ void QButtonGroup::setExclusive(bool exclusive)
 */
 
 /*!
+    \fn void QButtonGroup::idReleased(int id)
+    \since 5.15
+
+    This signal is emitted when a button with the given \a id is
+    released.
+
+    \sa QAbstractButton::released()
+*/
+
+/*!
     \fn void QButtonGroup::buttonToggled(QAbstractButton *button, bool checked)
     \since 5.2
 
@@ -190,6 +220,15 @@ void QButtonGroup::setExclusive(bool exclusive)
     \sa QAbstractButton::toggled()
 */
 
+/*!
+    \fn void QButtonGroup::idToggled(int id, bool checked)
+    \since 5.15
+
+    This signal is emitted when a button with the given \a id is toggled.
+    \a checked is true if the button is checked, or false if the button is unchecked.
+
+    \sa QAbstractButton::toggled()
+*/
 
 /*!
     Adds the given \a button to the button group. If \a id is -1,