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

 Conflicts:
	src/corelib/tools/qvector.h
		Make QVector(DataPointer dd) public to be able to properly merge
		5b4b437b30b320e2cd7c9a566999a39772e5d431 from 5.15 into dev.
	src/widgets/kernel/qapplication.cpp
	tests/auto/tools/moc/allmocs_baseline_in.json

Done-With: Christian Ehrlicher <ch.ehrlicher@gmx.de>
Change-Id: I929ba7c036d570382d0454c2c75f6f0d96ddbc01

3 files changed, 5 insertions, 5 deletions

diff --git a/examples/corelib/serialization/convert/cborconverter.cpp b/examples/corelib/serialization/convert/cborconverter.cpp
index f907bb0af6..60410ed26a 100644
--- a/examples/corelib/serialization/convert/cborconverter.cpp
+++ b/examples/corelib/serialization/convert/cborconverter.cpp
@@ -144,7 +144,7 @@ static QCborValue convertFromVariant(const QVariant &v, TrimFloatingPoint fpTrim
     }
 
     if (v.userType() == qMetaTypeId<VariantOrderedMap>()) {
-        const auto m = v.value<VariantOrderedMap>();
+        const auto m = qvariant_cast<VariantOrderedMap>(v);
         QCborMap map;
         for (const auto &pair : m)
             map.insert(convertFromVariant(pair.first, fpTrimming),
diff --git a/examples/corelib/serialization/convert/datastreamconverter.cpp b/examples/corelib/serialization/convert/datastreamconverter.cpp
index 7cdb844141..7e9f5e1bdc 100644
--- a/examples/corelib/serialization/convert/datastreamconverter.cpp
+++ b/examples/corelib/serialization/convert/datastreamconverter.cpp
@@ -98,7 +98,7 @@ static QString dumpVariant(const QVariant &v, const QString &indent = QLatin1Str
     int type = v.userType();
     if (type == qMetaTypeId<VariantOrderedMap>() || type == QVariant::Map) {
         const auto map = (type == QVariant::Map) ?
-                    VariantOrderedMap(v.toMap()) : v.value<VariantOrderedMap>();
+                    VariantOrderedMap(v.toMap()) : qvariant_cast<VariantOrderedMap>(v);
 
         result = QLatin1String("Map {");
         for (const auto &pair : map) {
diff --git a/examples/corelib/serialization/convert/xmlconverter.cpp b/examples/corelib/serialization/convert/xmlconverter.cpp
index e62801bf76..d9e724dfe1 100644
--- a/examples/corelib/serialization/convert/xmlconverter.cpp
+++ b/examples/corelib/serialization/convert/xmlconverter.cpp
@@ -336,7 +336,7 @@ static void variantToXml(QXmlStreamWriter &xml, const QVariant &v)
     } else if (type == QVariant::Map || type == qMetaTypeId<VariantOrderedMap>()) {
         const VariantOrderedMap map = (type == QVariant::Map) ?
                     VariantOrderedMap(v.toMap()) :
-                    v.value<VariantOrderedMap>();
+                    qvariant_cast<VariantOrderedMap>(v);
 
         xml.writeStartElement("map");
         for (const auto &pair : map) {
@@ -425,10 +425,10 @@ static void variantToXml(QXmlStreamWriter &xml, const QVariant &v)
         default:
             if (type == qMetaTypeId<qfloat16>()) {
                 xml.writeAttribute(typeString, "number");
-                xml.writeCharacters(QString::number(float(v.value<qfloat16>())));
+                xml.writeCharacters(QString::number(float(qvariant_cast<qfloat16>(v))));
             } else if (type == qMetaTypeId<QCborSimpleType>()) {
                 xml.writeAttribute(typeString, "CBOR simple type");
-                xml.writeCharacters(QString::number(int(v.value<QCborSimpleType>())));
+                xml.writeCharacters(QString::number(int(qvariant_cast<QCborSimpleType>(v))));
             } else {
                 // does this convert to string?
                 const char *typeName = v.typeName();