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

 Conflicts:
	examples/widgets/graphicsview/boxes/scene.h
	src/corelib/Qt5CoreMacros.cmake
	src/corelib/Qt6CoreMacros.cmake
	src/network/ssl/qsslsocket.cpp
	src/network/ssl/qsslsocket.h
	src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite.cpp
	src/testlib/CMakeLists.txt
	src/testlib/.prev_CMakeLists.txt
	tests/auto/corelib/tools/qscopeguard/tst_qscopeguard.cpp

Disabled building manual tests with CMake for now, because qmake
doesn't do it, and it confuses people.

Done-With: Alexandru Croitor <alexandru.croitor@qt.io>
Done-With: Volker Hilsheimer <volker.hilsheimer@qt.io>
Change-Id: I865ae347bd01f4e59f16d007b66d175a52f1f152

1 files changed, 20 insertions, 3 deletions

diff --git a/src/widgets/widgets/qcombobox.cpp b/src/widgets/widgets/qcombobox.cpp
index b249608ccc..3cfa213245 100644
--- a/src/widgets/widgets/qcombobox.cpp
+++ b/src/widgets/widgets/qcombobox.cpp
@@ -940,6 +940,8 @@ QStyleOptionComboBox QComboBoxPrivateContainer::comboStyleOption() const
     changes either through user interaction or programmatically. The
     item's \a index is passed or -1 if the combobox becomes empty or the
     currentIndex was reset.
+
+    \obsolete Use currentIndexChanged(int index, const QString &text) instead
 */
 
 /*!
@@ -949,6 +951,18 @@ QStyleOptionComboBox QComboBoxPrivateContainer::comboStyleOption() const
     This signal is sent whenever the currentIndex in the combobox
     changes either through user interaction or programmatically.  The
     item's \a text is passed.
+
+    \obsolete Use currentIndexChanged(int index, const QString &text) instead
+*/
+
+/*!
+    \fn void QComboBox::currentIndexChanged(int index, const QString &text)
+    \since 5.15
+
+    This signal is sent whenever the currentIndex in the combobox
+    changes either through user interaction or programmatically. The
+    item's \a index is passed or -1 if the combobox becomes empty or
+    the currentIndex was reset. The item's \a text is also passed.
 */
 
 /*!
@@ -1421,13 +1435,14 @@ void QComboBoxPrivate::_q_emitCurrentIndexChanged(const QModelIndex &index)
 {
     Q_Q(QComboBox);
     const QString text = itemText(index);
-    emit q->currentIndexChanged(index.row());
-#if QT_DEPRECATED_SINCE(5, 13)
+#if QT_DEPRECATED_SINCE(5, 15)
     QT_WARNING_PUSH
     QT_WARNING_DISABLE_DEPRECATED
+    emit q->currentIndexChanged(index.row());
     emit q->currentIndexChanged(text);
     QT_WARNING_POP
 #endif
+    emit q->currentIndexChanged(index.row(), text);
     // signal lineEdit.textChanged already connected to signal currentTextChanged, so don't emit double here
     if (!lineEdit)
         emit q->currentTextChanged(text);
@@ -3099,12 +3114,14 @@ void QComboBox::changeEvent(QEvent *e)
         d->updateViewContainerPaletteAndOpacity();
         break;
     }
-    case QEvent::FontChange:
+    case QEvent::FontChange: {
         d->sizeHint = QSize(); // invalidate size hint
         d->viewContainer()->setFont(font());
+        d->viewContainer()->itemView()->doItemsLayout();
         if (d->lineEdit)
             d->updateLineEditGeometry();
         break;
+    }
     default:
         break;
     }