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, 5 insertions, 5 deletions

diff --git a/tests/manual/diaglib/nativewindowdump_win.cpp b/tests/manual/diaglib/nativewindowdump_win.cpp
index 6334fcfedd..d99a3a3d38 100644
--- a/tests/manual/diaglib/nativewindowdump_win.cpp
+++ b/tests/manual/diaglib/nativewindowdump_win.cpp
@@ -71,7 +71,7 @@ static QTextStream &operator<<(QTextStream &str, const QSize &s)
 
 static QTextStream &operator<<(QTextStream &str, const QRect &rect)
 {
-    str << rect.size() << forcesign << rect.x() << rect.y() << noforcesign;
+    str << rect.size() << Qt::forcesign << rect.x() << rect.y() << Qt::noforcesign;
     return str;
 }
 
@@ -112,7 +112,7 @@ static bool isTopLevel(HWND hwnd)
 
 static void formatNativeWindow(HWND hwnd, QTextStream &str)
 {
-    str << hex << showbase << quintptr(hwnd) << noshowbase << dec;
+    str << Qt::hex << Qt::showbase << quintptr(hwnd) << Qt::noshowbase << Qt::dec;
 
     const bool topLevel = isTopLevel(hwnd);
     if (topLevel)
@@ -138,7 +138,7 @@ static void formatNativeWindow(HWND hwnd, QTextStream &str)
     if (GetClassName(hwnd, buf, sizeof(buf)/sizeof(buf[0])))
         str << '"' << QString::fromWCharArray(buf) << '"';
 
-    str << hex << showbase;
+    str << Qt::hex << Qt::showbase;
     if (const LONG_PTR style = GetWindowLongPtr(hwnd, GWL_STYLE)) {
         str << " style=" << style;
         debugWinStyle(str, style, WS_OVERLAPPED)
@@ -210,7 +210,7 @@ static void formatNativeWindow(HWND hwnd, QTextStream &str)
     if (const ULONG_PTR wndProc = GetClassLongPtr(hwnd, GCLP_WNDPROC))
         str << " wndProc=" << wndProc;
 
-    str << noshowbase << dec;
+    str << Qt::noshowbase << Qt::dec;
 
     if (GetWindowModuleFileName(hwnd, buf, sizeof(buf)/sizeof(buf[0])))
         str << " module=\"" << QString::fromWCharArray(buf) << '"';
@@ -260,7 +260,7 @@ static void dumpNativeWindows(const WIdVector& wins)
     DumpContext dc;
     QString s;
     dc.stream = QSharedPointer<QTextStream>(new QTextStream(&s));
-    foreach (WId win, wins)
+    for (WId win : wins)
         dumpNativeWindowRecursion(reinterpret_cast<HWND>(win), &dc);
 #if QT_VERSION >= 0x050400
     qDebug().noquote() << s;