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

 Conflicts:
	examples/opengl/doc/src/cube.qdoc
	src/corelib/global/qlibraryinfo.cpp
	src/corelib/text/qbytearray_p.h
	src/corelib/text/qlocale_data_p.h
	src/corelib/time/qhijricalendar_data_p.h
	src/corelib/time/qjalalicalendar_data_p.h
	src/corelib/time/qromancalendar_data_p.h
	src/network/ssl/qsslcertificate.h
	src/widgets/doc/src/graphicsview.qdoc
	src/widgets/widgets/qcombobox.cpp
	src/widgets/widgets/qcombobox.h
	tests/auto/corelib/tools/qscopeguard/tst_qscopeguard.cpp
	tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
	tests/benchmarks/corelib/io/qdiriterator/qdiriterator.pro
	tests/manual/diaglib/debugproxystyle.cpp
	tests/manual/diaglib/qwidgetdump.cpp
	tests/manual/diaglib/qwindowdump.cpp
	tests/manual/diaglib/textdump.cpp
	util/locale_database/cldr2qlocalexml.py
	util/locale_database/qlocalexml.py
	util/locale_database/qlocalexml2cpp.py

Resolution of util/locale_database/ are based on:
https://codereview.qt-project.org/c/qt/qtbase/+/294250
and src/corelib/{text,time}/*_data_p.h were then regenerated by
running those scripts.

Updated CMakeLists.txt in each of
	tests/auto/corelib/serialization/qcborstreamreader/
	tests/auto/corelib/serialization/qcborvalue/
	tests/auto/gui/kernel/
and generated new ones in each of
	tests/auto/gui/kernel/qaddpostroutine/
	tests/auto/gui/kernel/qhighdpiscaling/
	tests/libfuzzer/corelib/text/qregularexpression/optimize/
	tests/libfuzzer/gui/painting/qcolorspace/fromiccprofile/
	tests/libfuzzer/gui/text/qtextdocument/sethtml/
	tests/libfuzzer/gui/text/qtextdocument/setmarkdown/
	tests/libfuzzer/gui/text/qtextlayout/beginlayout/
by running util/cmake/pro2cmake.py on their changed .pro files.

Changed target name in
	tests/auto/gui/kernel/qaction/qaction.pro
	tests/auto/gui/kernel/qaction/qactiongroup.pro
	tests/auto/gui/kernel/qshortcut/qshortcut.pro
to ensure unique target names for CMake

Changed tst_QComboBox::currentIndex to not test the
currentIndexChanged(QString), as that one does not exist in Qt 6
anymore.

Change-Id: I9a85705484855ae1dc874a81f49d27a50b0dcff7

2 files changed, 57 insertions, 3 deletions

diff --git a/src/corelib/itemmodels/qitemselectionmodel.cpp b/src/corelib/itemmodels/qitemselectionmodel.cpp
index e4ac5da299..27442fb2fa 100644
--- a/src/corelib/itemmodels/qitemselectionmodel.cpp
+++ b/src/corelib/itemmodels/qitemselectionmodel.cpp
@@ -1473,6 +1473,9 @@ bool QItemSelectionModel::isSelected(const QModelIndex &index) const
     Note that this function is usually faster than calling isSelected()
     on all items in the same row and that unselectable items are
     ignored.
+
+    \note Since Qt 5.15, the default argument for \a parent is an empty
+          model index.
 */
 bool QItemSelectionModel::isRowSelected(int row, const QModelIndex &parent) const
 {
@@ -1545,6 +1548,9 @@ bool QItemSelectionModel::isRowSelected(int row, const QModelIndex &parent) cons
     Note that this function is usually faster than calling isSelected()
     on all items in the same column and that unselectable items are
     ignored.
+
+    \note Since Qt 5.15, the default argument for \a parent is an empty
+          model index.
 */
 bool QItemSelectionModel::isColumnSelected(int column, const QModelIndex &parent) const
 {
@@ -1616,6 +1622,9 @@ bool QItemSelectionModel::isColumnSelected(int column, const QModelIndex &parent
 /*!
     Returns \c true if there are any items selected in the \a row with the given
     \a parent.
+
+    \note Since Qt 5.15, the default argument for \a parent is an empty
+          model index.
 */
 bool QItemSelectionModel::rowIntersectsSelection(int row, const QModelIndex &parent) const
 {
@@ -1649,6 +1658,9 @@ bool QItemSelectionModel::rowIntersectsSelection(int row, const QModelIndex &par
 /*!
     Returns \c true if there are any items selected in the \a column with the given
     \a parent.
+
+    \note Since Qt 5.15, the default argument for \a parent is an empty
+          model index.
 */
 bool QItemSelectionModel::columnIntersectsSelection(int column, const QModelIndex &parent) const
 {
diff --git a/src/corelib/itemmodels/qsortfilterproxymodel.cpp b/src/corelib/itemmodels/qsortfilterproxymodel.cpp
index 6ed4c942d8..5850551361 100644
--- a/src/corelib/itemmodels/qsortfilterproxymodel.cpp
+++ b/src/corelib/itemmodels/qsortfilterproxymodel.cpp
@@ -2678,12 +2678,19 @@ void QSortFilterProxyModel::setFilterKeyColumn(int column)
     \property QSortFilterProxyModel::filterCaseSensitivity
 
     \brief the case sensitivity of the QRegExp pattern used to filter the
-    contents of the source model
+    contents of the source model.
 
     By default, the filter is case sensitive.
 
     \sa filterRegExp, sortCaseSensitivity
 */
+
+/*!
+    \since 5.15
+    \fn void QSortFilterProxyModel::filterCaseSensitivityChanged(Qt::CaseSensitivity filterCaseSensitivity)
+    \brief This signal is emitted when the case sensitivity of the filter
+           changes to \a filterCaseSensitivity.
+ */
 Qt::CaseSensitivity QSortFilterProxyModel::filterCaseSensitivity() const
 {
     Q_D(const QSortFilterProxyModel);
@@ -2710,6 +2717,13 @@ void QSortFilterProxyModel::setFilterCaseSensitivity(Qt::CaseSensitivity cs)
 
     \sa filterCaseSensitivity, lessThan()
 */
+
+/*!
+    \since 5.15
+    \fn void QSortFilterProxyModel::sortCaseSensitivityChanged(Qt::CaseSensitivity sortCaseSensitivity)
+    \brief This signal is emitted when the case sensitivity for sorting
+           changes to \a sortCaseSensitivity.
+*/
 Qt::CaseSensitivity QSortFilterProxyModel::sortCaseSensitivity() const
 {
     Q_D(const QSortFilterProxyModel);
@@ -2736,6 +2750,13 @@ void QSortFilterProxyModel::setSortCaseSensitivity(Qt::CaseSensitivity cs)
 
     \sa sortCaseSensitivity, lessThan()
 */
+
+/*!
+    \since 5.15
+    \fn void QSortFilterProxyModel::sortLocaleAwareChanged(bool sortLocaleAware)
+    \brief This signal is emitted when the locale aware setting
+           changes to \a sortLocaleAware.
+*/
 bool QSortFilterProxyModel::isSortLocaleAware() const
 {
     Q_D(const QSortFilterProxyModel);
@@ -2856,12 +2877,19 @@ void QSortFilterProxyModel::setDynamicSortFilter(bool enable)
 /*!
     \since 4.2
     \property QSortFilterProxyModel::sortRole
-    \brief the item role that is used to query the source model's data when sorting items
+    \brief the item role that is used to query the source model's data when
+           sorting items.
 
     The default value is Qt::DisplayRole.
 
     \sa lessThan()
 */
+
+/*!
+    \since 5.15
+    \fn void QSortFilterProxyModel::sortRoleChanged(int sortRole)
+    \brief This signal is emitted when the sort role changes to \a sortRole.
+*/
 int QSortFilterProxyModel::sortRole() const
 {
     Q_D(const QSortFilterProxyModel);
@@ -2881,12 +2909,19 @@ void QSortFilterProxyModel::setSortRole(int role)
 /*!
     \since 4.2
     \property QSortFilterProxyModel::filterRole
-    \brief the item role that is used to query the source model's data when filtering items
+    \brief the item role that is used to query the source model's data when
+           filtering items.
 
     The default value is Qt::DisplayRole.
 
     \sa filterAcceptsRow()
 */
+
+/*!
+    \since 5.15
+    \fn void QSortFilterProxyModel::filterRoleChanged(int filterRole)
+    \brief This signal is emitted when the filter role changes to \a filterRole.
+*/
 int QSortFilterProxyModel::filterRole() const
 {
     Q_D(const QSortFilterProxyModel);
@@ -2914,6 +2949,13 @@ void QSortFilterProxyModel::setFilterRole(int role)
 
     \sa filterAcceptsRow()
 */
+
+/*!
+    \since 5.15
+    \fn void QSortFilterProxyModel::recursiveFilteringEnabledChanged(int recursiveFilteringEnabled)
+    \brief This signal is emitted when the recursive filter setting is changed
+           to \a recursiveFilteringEnabled.
+*/
 bool QSortFilterProxyModel::isRecursiveFilteringEnabled() const
 {
     Q_D(const QSortFilterProxyModel);