1 files changed, 15 insertions, 15 deletions

diff --git a/src/libs/utils/persistentsettings.cpp b/src/libs/utils/persistentsettings.cpp
index 54a829004b3..3702ecf960b 100644
--- a/src/libs/utils/persistentsettings.cpp
+++ b/src/libs/utils/persistentsettings.cpp
@@ -106,13 +106,13 @@ const QString keyAttribute("key");
 
 struct ParseValueStackEntry
 {
-    explicit ParseValueStackEntry(QVariant::Type t = QVariant::Invalid, const QString &k = {}) : type(t), key(k) {}
+    explicit ParseValueStackEntry(QMetaType::Type t = QMetaType::UnknownType, const QString &k = {}) : typeId(t), key(k) {}
     explicit ParseValueStackEntry(const QVariant &aSimpleValue, const QString &k);
 
     QVariant value() const;
     void addChild(const QString &key, const QVariant &v);
 
-    QVariant::Type type;
+    QMetaType::Type typeId;
     QString key;
     QVariant simpleValue;
     QVariantList listValue;
@@ -120,19 +120,19 @@ struct ParseValueStackEntry
 };
 
 ParseValueStackEntry::ParseValueStackEntry(const QVariant &aSimpleValue, const QString &k)
-    : type(aSimpleValue.type()), key(k), simpleValue(aSimpleValue)
+    : typeId(QMetaType::Type(aSimpleValue.typeId())), key(k), simpleValue(aSimpleValue)
 {
     QTC_ASSERT(simpleValue.isValid(), return);
 }
 
 QVariant ParseValueStackEntry::value() const
 {
-    switch (type) {
-    case QVariant::Invalid:
+    switch (typeId) {
+    case QMetaType::UnknownType:
         return QVariant();
-    case QVariant::Map:
+    case QMetaType::QVariantMap:
         return QVariant(mapValue);
-    case QVariant::List:
+    case QMetaType::QVariantList:
         return QVariant(listValue);
     default:
         break;
@@ -142,16 +142,16 @@ QVariant ParseValueStackEntry::value() const
 
 void ParseValueStackEntry::addChild(const QString &key, const QVariant &v)
 {
-    switch (type) {
-    case QVariant::Map:
+    switch (typeId) {
+    case QMetaType::QVariantMap:
         mapValue.insert(key, v);
         break;
-    case QVariant::List:
+    case QMetaType::QVariantList:
         listValue.push_back(v);
         break;
     default:
         qWarning() << "ParseValueStackEntry::Internal error adding " << key << v << " to "
-                 << QVariant::typeToName(type) << value();
+                 << QMetaType(typeId).name() << value();
         break;
     }
 }
@@ -226,14 +226,14 @@ bool ParseContext::handleStartElement(QXmlStreamReader &r)
         const QXmlStreamAttributes attributes = r.attributes();
         const QString key = attributes.hasAttribute(keyAttribute) ?
                     attributes.value(keyAttribute).toString() : QString();
-        m_valueStack.push_back(ParseValueStackEntry(QVariant::List, key));
+        m_valueStack.push_back(ParseValueStackEntry(QMetaType::QVariantList, key));
         return false;
     }
     if (name == valueMapElement) {
         const QXmlStreamAttributes attributes = r.attributes();
         const QString key = attributes.hasAttribute(keyAttribute) ?
                     attributes.value(keyAttribute).toString() : QString();
-        m_valueStack.push_back(ParseValueStackEntry(QVariant::Map, key));
+        m_valueStack.push_back(ParseValueStackEntry(QMetaType::QVariantMap, key));
         return false;
     }
     return false;
@@ -369,8 +369,8 @@ static void writeVariantValue(QXmlStreamWriter &w, const QVariant &variant, cons
         w.writeAttribute(typeAttribute, QLatin1String(variant.typeName()));
         if (!key.isEmpty())
             w.writeAttribute(keyAttribute, xmlAttrFromKey(key));
-        switch (variant.type()) {
-        case QVariant::Rect:
+        switch (variant.typeId()) {
+        case QMetaType::QRect:
             w.writeCharacters(rectangleToString(variant.toRect()));
             break;
         default: