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

1 files changed, 68 insertions, 0 deletions

diff --git a/tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp b/tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp
index 999cf4a941..e4f927750e 100644
--- a/tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp
+++ b/tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp
@@ -83,6 +83,7 @@ Q_OBJECT
 
 private slots:
     void arrowKeyNavigation();
+    void keyNavigationPushButtons();
     void exclusive();
     void exclusiveWithActions();
     void testSignals();
@@ -185,6 +186,73 @@ void tst_QButtonGroup::arrowKeyNavigation()
     QVERIFY(bt3.hasFocus());
 }
 
+/*
+    Test that tab and arrow key navigation through buttons
+    in an invisible button group works as expected. Tabbing
+    into the group should give focus to the checked button,
+    and arrow navigation should change the checked button and
+    move focus.
+*/
+void tst_QButtonGroup::keyNavigationPushButtons()
+{
+    if (!qt_tab_all_widgets())
+        QSKIP("This test requires full keyboard control to be enabled.");
+
+    QDialog dlg(nullptr);
+    QLineEdit *le1 = new QLineEdit;
+    le1->setObjectName("le1");
+    QPushButton *pb1 = new QPushButton("Exclusive 1");
+    pb1->setObjectName("pb1");
+    pb1->setCheckable(true);
+    pb1->setChecked(true);
+    QPushButton *pb2 = new QPushButton("Exclusive 2");
+    pb2->setObjectName("pb2");
+    pb2->setCheckable(true);
+    QPushButton *pb3 = new QPushButton("Exclusive 3");
+    pb3->setObjectName("pb3");
+    pb3->setCheckable(true);
+    QLineEdit *le2 = new QLineEdit;
+    le2->setObjectName("le2");
+
+    QVBoxLayout* layout = new QVBoxLayout(&dlg);
+    layout->addWidget(le1);
+    layout->addWidget(pb1);
+    layout->addWidget(pb2);
+    layout->addWidget(pb3);
+    layout->addWidget(le2);
+
+    QButtonGroup *buttonGroup = new QButtonGroup;
+    buttonGroup->addButton(pb1);
+    buttonGroup->addButton(pb2);
+    buttonGroup->addButton(pb3);
+
+    dlg.show();
+    qApp->setActiveWindow(&dlg);
+    if (!QTest::qWaitForWindowActive(&dlg))
+        QSKIP("Window activation failed, skipping test");
+
+    QVERIFY2(le1->hasFocus(), qPrintable(qApp->focusWidget()->objectName()));
+    QTest::keyClick(qApp->focusWidget(), Qt::Key_Tab);
+    QVERIFY2(pb1->hasFocus(), qPrintable(qApp->focusWidget()->objectName()));
+    QVERIFY2(pb1->isChecked(), qPrintable(buttonGroup->checkedButton()->objectName()));
+    QTest::keyClick(qApp->focusWidget(), Qt::Key_Down);
+    QVERIFY2(pb2->hasFocus(), qPrintable(qApp->focusWidget()->objectName()));
+    QVERIFY2(pb2->isChecked(), qPrintable(buttonGroup->checkedButton()->objectName()));
+    QTest::keyClick(qApp->focusWidget(), Qt::Key_Down);
+    QVERIFY2(pb3->hasFocus(), qPrintable(qApp->focusWidget()->objectName()));
+    QVERIFY2(pb3->isChecked(), qPrintable(buttonGroup->checkedButton()->objectName()));
+    QTest::keyClick(qApp->focusWidget(), Qt::Key_Up);
+    QVERIFY2(pb2->hasFocus(), qPrintable(qApp->focusWidget()->objectName()));
+    QVERIFY2(pb2->isChecked(), qPrintable(buttonGroup->checkedButton()->objectName()));
+    QTest::keyClick(qApp->focusWidget(), Qt::Key_Tab);
+    QVERIFY2(le2->hasFocus(), qPrintable(qApp->focusWidget()->objectName()));
+    QTest::keyClick(qApp->focusWidget(), Qt::Key_Backtab);
+    QVERIFY2(pb2->hasFocus(), qPrintable(qApp->focusWidget()->objectName()));
+    QVERIFY2(pb2->isChecked(), qPrintable(buttonGroup->checkedButton()->objectName()));
+    QTest::keyClick(qApp->focusWidget(), Qt::Key_Backtab);
+    QVERIFY2(le1->hasFocus(), qPrintable(qApp->focusWidget()->objectName()));
+}
+
 void tst_QButtonGroup::exclusiveWithActions()
 {
     QDialog dlg(0);