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, 41 insertions, 31 deletions

diff --git a/src/sql/doc/snippets/code/doc_src_sql-driver.cpp b/src/sql/doc/snippets/code/doc_src_sql-driver.cpp
index 3757ba2eff..acfd31ee3a 100644
--- a/src/sql/doc/snippets/code/doc_src_sql-driver.cpp
+++ b/src/sql/doc/snippets/code/doc_src_sql-driver.cpp
@@ -47,25 +47,38 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-
+#include <QSqlDatabase>
+#include <QSqlQuery>
+#include <QSqlDriver>
+#include <QSqlResult>
+#include <QVariant>
+#include <QDebug>
+
+void testProc()
+{
 //! [2]
 QSqlQuery q;
 q.exec("call qtestproc (@outval1, @outval2)");
 q.exec("select @outval1, @outval2");
-q.next();
-qDebug() << q.value(0) << q.value(1); // outputs "42" and "43"
+if (q.next())
+    qDebug() << q.value(0) << q.value(1); // outputs "42" and "43"
 //! [2]
+}
 
-
+void callStoredProc()
+{
 //! [10]
 // STORED_PROC uses the return statement or returns multiple result sets
 QSqlQuery query;
 query.setForwardOnly(true);
 query.exec("{call STORED_PROC}");
 //! [10]
+}
 
-
+void setHost()
+{
 //! [24]
+QSqlDatabase db;
 db.setHostName("MyServer");
 db.setDatabaseName("C:\\test.gdb");
 //! [24]
@@ -74,61 +87,57 @@ db.setDatabaseName("C:\\test.gdb");
 //! [25]
 // connect to database using the Latin-1 character set
 db.setConnectOptions("ISC_DPB_LC_CTYPE=Latin1");
-db.open();
+if (db.open())
+    qDebug("The database connection is open.");
 //! [25]
+}
 
-
+void exProc()
+{
 //! [26]
 QSqlQuery q;
 q.exec("execute procedure my_procedure");
-q.next();
-qDebug() << q.value(0); // outputs the first RETURN/OUT value
+if (q.next())
+    qDebug() << q.value(0); // outputs the first RETURN/OUT value
 //! [26]
 
-
+qDebug( \
 //! [31]
-QSqlDatabase: QMYSQL driver not loaded
-QSqlDatabase: available drivers: QMYSQL
+"QSqlDatabase: QMYSQL driver not loaded \
+QSqlDatabase: available drivers: QMYSQL" \
 //! [31]
+);
 
-
+/* Commented because the following line is not compilable
 //! [34]
 column.contains(QRegularExpression("pattern"));
 //! [34]
-
-
-//! [36]
-QSqlQuery query(db);
-query.setForwardOnly(true);
-query.exec("SELECT * FROM table");
-while (query.next()) {
-    // Handle changes in every iteration of the loop
-    QVariant v = query.result()->handle();
-    if (qstrcmp(v.typeName(), "PGresult*") == 0) {
-        PGresult *handle = *static_cast<PGresult **>(v.data());
-        if (handle) {
-            // Do something...
-        }
-    }
+*/
 }
-//! [36]
 
 
+
+void updTable2()
+{
+QSqlDatabase db;
 //! [37]
 int value;
-QSqlQuery query1(db);
+QSqlQuery query1;
 query1.setForwardOnly(true);
 query1.exec("select * FROM table1");
 while (query1.next()) {
     value = query1.value(0).toInt();
     if (value == 1) {
-        QSqlQuery query2(db);
+        QSqlQuery query2;
         query2.exec("update table2 set col=2");  // WRONG: This will discard all results of
     }                                            // query1, and cause the loop to quit
 }
 //! [37]
+}
 
 
+void setConnString()
+{
 //! [39]
 QSqlDatabase db = QSqlDatabase::addDatabase("QODBC");
 QString connectString = QStringLiteral(
@@ -139,3 +148,4 @@ QString connectString = QStringLiteral(
     "SCROLLABLERESULT=true");
 db.setDatabaseName(connectString);
 //! [39]
+}