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/textconverter.cpp b/examples/corelib/serialization/convert/textconverter.cpp
index 7aed08f96c..ae03b9a334 100644
--- a/examples/corelib/serialization/convert/textconverter.cpp
+++ b/examples/corelib/serialization/convert/textconverter.cpp
@@ -56,21 +56,21 @@
 static void dumpVariant(QTextStream &out, const QVariant &v)
 {
     switch (v.userType()) {
-    case QVariant::List: {
+    case QMetaType::QVariantList: {
         const QVariantList list = v.toList();
         for (const QVariant &item : list)
             dumpVariant(out, item);
         break;
     }
 
-    case QVariant::String: {
+    case QMetaType::QString: {
         const QStringList list = v.toStringList();
         for (const QString &s : list)
             out << s << Qt::endl;
         break;
     }
 
-    case QVariant::Map: {
+    case QMetaType::QVariantMap: {
         const QVariantMap map = v.toMap();
         for (auto it = map.begin(); it != map.end(); ++it) {
             out << it.key() << " => ";