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

 Conflicts:
        src/corelib/Qt5CoreConfigExtras.cmake.in
        src/corelib/Qt5CoreMacros.cmake
        src/dbus/Qt5DBusConfigExtras.cmake.in
        src/widgets/Qt5WidgetsConfigExtras.cmake.in

Change-Id: Ib782f3b177c38b2cce83beebe15be9c0baa578f7

1 files changed, 3 insertions, 3 deletions

diff --git a/examples/corelib/serialization/convert/datastreamconverter.cpp b/examples/corelib/serialization/convert/datastreamconverter.cpp
index 7e9f5e1bdc..6f0ca41ff5 100644
--- a/examples/corelib/serialization/convert/datastreamconverter.cpp
+++ b/examples/corelib/serialization/convert/datastreamconverter.cpp
@@ -96,8 +96,8 @@ static QString dumpVariant(const QVariant &v, const QString &indent = QLatin1Str
     QString indented = indent + QLatin1String("  ");
 
     int type = v.userType();
-    if (type == qMetaTypeId<VariantOrderedMap>() || type == QVariant::Map) {
-        const auto map = (type == QVariant::Map) ?
+    if (type == qMetaTypeId<VariantOrderedMap>() || type == QMetaType::QVariantMap) {
+        const auto map = (type == QMetaType::QVariantMap) ?
                     VariantOrderedMap(v.toMap()) : qvariant_cast<VariantOrderedMap>(v);
 
         result = QLatin1String("Map {");
@@ -109,7 +109,7 @@ static QString dumpVariant(const QVariant &v, const QString &indent = QLatin1Str
         }
         result.chop(1);             // remove comma
         result += indent + QLatin1String("},");
-    } else if (type == QVariant::List) {
+    } else if (type == QMetaType::QVariantList) {
         const QVariantList list = v.toList();
 
         result = QLatin1String("List [");