Merge remote-tracking branch 'origin/dev' into wip/cmake

Removed dependencies.yaml.

Change-Id: I7d1b06564b6b5c71882fe058f094894af7cb3efc

8 files changed, 58 insertions, 15 deletions

diff --git a/.qmake.conf b/.qmake.conf
index 183ef32..45dbe7a 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -2,4 +2,6 @@ load(qt_build_config)
 CONFIG += qt_example_installs
 CONFIG += warning_clean
 
+DEFINES += QT_NO_FOREACH QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST
+
 MODULE_VERSION = 6.0.0
diff --git a/dist/changes-5.12.5 b/dist/changes-5.12.5
new file mode 100644
index 0000000..e8be931
--- /dev/null
+++ b/dist/changes-5.12.5
@@ -0,0 +1,20 @@
+Qt 5.12.5 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.12.0 through 5.12.4.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+https://doc.qt.io/qt-5/index.html
+
+The Qt version 5.12 series is binary compatible with the 5.11.x series.
+Applications compiled for 5.11 will continue to run with 5.12.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+ - This release contains only minor code improvements.
diff --git a/dist/changes-5.13.1 b/dist/changes-5.13.1
new file mode 100644
index 0000000..57ebdbe
--- /dev/null
+++ b/dist/changes-5.13.1
@@ -0,0 +1,20 @@
+Qt 5.13.1 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.13.0.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+https://doc.qt.io/qt-5/index.html
+
+The Qt version 5.13 series is binary compatible with the 5.12.x series.
+Applications compiled for 5.12 will continue to run with 5.13.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+ - This release contains only minor code improvements.
diff --git a/src/imports/scxmlstatemachine/plugins.qmltypes b/src/imports/scxmlstatemachine/plugins.qmltypes
index f0b5a20..1b6c469 100644
--- a/src/imports/scxmlstatemachine/plugins.qmltypes
+++ b/src/imports/scxmlstatemachine/plugins.qmltypes
@@ -4,7 +4,7 @@ import QtQuick.tooling 1.2
 // It is used for QML tooling purposes only.
 //
 // This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable QtScxml 5.13'
+// 'qmlplugindump -nonrelocatable QtScxml 5.14'
 
 Module {
     dependencies: ["QtQuick 2.0"]
diff --git a/src/scxml/doc/qtscxml.qdocconf b/src/scxml/doc/qtscxml.qdocconf
index 4902ae4..6d90bd1 100644
--- a/src/scxml/doc/qtscxml.qdocconf
+++ b/src/scxml/doc/qtscxml.qdocconf
@@ -1,4 +1,5 @@
 include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
+include($QT_INSTALL_DOCS/config/exampleurl-qtscxml.qdocconf)
 
 project                 = QtScxml
 description             = Qt Scxml Reference Documentation
diff --git a/tests/auto/scion/scion.pro b/tests/auto/scion/scion.pro
index 6e1f7f4..1ebc624 100644
--- a/tests/auto/scion/scion.pro
+++ b/tests/auto/scion/scion.pro
@@ -89,15 +89,15 @@ for (f,ALLSCXMLS) {
 ALLFILES = $$files($$SCXMLS_DIR/*.*, true)
 for (f,ALLFILES) {
     base = $$relative_path($$f,$$absolute_path($$SCXMLS_DIR))
-    file = $$relative_path($$f, $$absolute_path($$PWD))
+    file = $$relative_path($$f, $$absolute_path($$OUT_PWD))
     qrc += '<file alias="$$base">$$file</file>'
 }
 
 contents = $$inc_list "std::function<QScxmlStateMachine *()> creators[] = {" $$func_list "};"
-write_file("scxml/compiled_tests.h", contents)|error("Aborting.")
+write_file("$$OUT_PWD/scxml/compiled_tests.h", contents)|error("Aborting.")
 
 contents = "const char *testBases[] = {" $$testBases "};"
-write_file("scxml/scion.h", contents)|error("Aborting.")
+write_file("$$OUT_PWD/scxml/scion.h", contents)|error("Aborting.")
 
 contents = '<!DOCTYPE RCC><RCC version=\"1.0\">' '<qresource>' $$qrc '</qresource></RCC>'
-write_file("scion.qrc", contents)|error("Aborting.")
+write_file("$$OUT_PWD/scion.qrc", contents)|error("Aborting.")
diff --git a/tools/qscxmlc/generator.cpp b/tools/qscxmlc/generator.cpp
index ea3a066..6febf09 100644
--- a/tools/qscxmlc/generator.cpp
+++ b/tools/qscxmlc/generator.cpp
@@ -172,7 +172,7 @@ bool Generator::registerableMetaType(const QByteArray &propertyType)
 #undef STREAM_SMART_POINTER
         ;
 
-    foreach (const QByteArray &smartPointer, smartPointers)
+    for (const QByteArray &smartPointer : smartPointers)
         if (propertyType.startsWith(smartPointer + "<") && !propertyType.endsWith("&"))
             return knownQObjectClasses.contains(propertyType.mid(smartPointer.size() + 1, propertyType.size() - smartPointer.size() - 1 - 1));
 
@@ -181,7 +181,7 @@ bool Generator::registerableMetaType(const QByteArray &propertyType)
       QT_FOR_EACH_AUTOMATIC_TEMPLATE_1ARG(STREAM_1ARG_TEMPLATE)
 #undef STREAM_1ARG_TEMPLATE
     ;
-    foreach (const QByteArray &oneArgTemplateType, oneArgTemplates)
+    for (const QByteArray &oneArgTemplateType : oneArgTemplates)
         if (propertyType.startsWith(oneArgTemplateType + "<") && propertyType.endsWith(">")) {
             const int argumentSize = propertyType.size() - oneArgTemplateType.size() - 1
                                      // The closing '>'
@@ -1202,8 +1202,8 @@ void Generator::generateStaticMetacall()
                 fprintf(out, "        case %d:\n", it.key());
                 fprintf(out, "            switch (*reinterpret_cast<int*>(_a[1])) {\n");
                 fprintf(out, "            default: *reinterpret_cast<int*>(_a[0]) = -1; break;\n");
-                foreach (const QByteArray &key, it->uniqueKeys()) {
-                    foreach (int argumentID, it->values(key))
+                for (const QByteArray &key : it->uniqueKeys()) {
+                    for (int argumentID : it->values(key))
                         fprintf(out, "            case %d:\n", argumentID);
                     fprintf(out, "                *reinterpret_cast<int*>(_a[0]) = qRegisterMetaType< %s >(); break;\n", key.constData());
                 }
@@ -1268,8 +1268,8 @@ void Generator::generateStaticMetacall()
         fprintf(out, "if (_c == QMetaObject::RegisterPropertyMetaType) {\n");
         fprintf(out, "        switch (_id) {\n");
         fprintf(out, "        default: *reinterpret_cast<int*>(_a[0]) = -1; break;\n");
-        foreach (const QByteArray &key, automaticPropertyMetaTypes.uniqueKeys()) {
-            foreach (int propertyID, automaticPropertyMetaTypes.values(key))
+        for (const QByteArray &key : automaticPropertyMetaTypes.uniqueKeys()) {
+            for (int propertyID : automaticPropertyMetaTypes.values(key))
                 fprintf(out, "        case %d:\n", propertyID);
             fprintf(out, "            *reinterpret_cast<int*>(_a[0]) = qRegisterMetaType< %s >(); break;\n", key.constData());
         }
@@ -1593,8 +1593,8 @@ void Generator::generatePluginMetaData()
     data.insert(QStringLiteral("MetaData"), cdef->pluginData.metaData.object());
 
     // Add -M args from the command line:
-    foreach (const QString &key, cdef->pluginData.metaArgs.keys())
-        data.insert(key, cdef->pluginData.metaArgs.value(key));
+    for (auto it = cdef->pluginData.metaArgs.cbegin(), end = cdef->pluginData.metaArgs.cend(); it != end; ++it)
+        data.insert(it.key(), it.value());
 
     fputs("\nQT_PLUGIN_METADATA_SECTION const uint qt_section_alignment_dummy = 42;\n\n"
           "#ifdef QT_NO_DEBUG\n", out);
diff --git a/tools/qscxmlc/scxmlcppdumper.cpp b/tools/qscxmlc/scxmlcppdumper.cpp
index 6f81bd9..1aca09e 100644
--- a/tools/qscxmlc/scxmlcppdumper.cpp
+++ b/tools/qscxmlc/scxmlcppdumper.cpp
@@ -676,11 +676,11 @@ QString CppDumper::mangleIdentifier(const QString &str)
     }
 
     for (int ei = str.length(); i != ei; ++i) {
-        auto c = str.at(i).unicode();
+        auto c = str.at(i);
         if ((c >= QLatin1Char('0') && c <= QLatin1Char('9')) || isNonDigit(c)) {
             mangled += c;
         } else {
-            mangled += QLatin1String("_0x") + QString::number(c, 16) + QLatin1Char('_');
+            mangled += QLatin1String("_0x") + QString::number(c.unicode(), 16) + QLatin1Char('_');
         }
     }