qt6: Do not use QVariant::Type as it was deprecated

Change-Id: I0dad1ee403176a665e4e9dead2f94dd032e1d75b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

8 files changed, 40 insertions, 40 deletions

diff --git a/src/lib/corelib/api/projectdata.cpp b/src/lib/corelib/api/projectdata.cpp
index 6af7798f3..289c14781 100644
--- a/src/lib/corelib/api/projectdata.cpp
+++ b/src/lib/corelib/api/projectdata.cpp
@@ -994,7 +994,7 @@ static QString mapToString(const QVariantMap &map, const QString &prefix)
     QString stringRep;
     for (const QString &key : qAsConst(keys)) {
         const QVariant &val = map.value(key);
-        if (val.userType() == QVariant::Map) {
+        if (val.userType() == QMetaType::QVariantMap) {
             stringRep += mapToString(val.value<QVariantMap>(), prefix + key + QLatin1Char('.'));
         } else {
             stringRep += QStringLiteral("%1%2: %3\n")
diff --git a/src/lib/corelib/buildgraph/dependencyparametersscriptvalue.cpp b/src/lib/corelib/buildgraph/dependencyparametersscriptvalue.cpp
index e875866a7..ac6b1dc42 100644
--- a/src/lib/corelib/buildgraph/dependencyparametersscriptvalue.cpp
+++ b/src/lib/corelib/buildgraph/dependencyparametersscriptvalue.cpp
@@ -53,7 +53,7 @@ static QScriptValue toScriptValue(ScriptEngine *engine, const QString &productNa
     QScriptValue obj = engine->newObject();
     bool objIdAddedToObserver = false;
     for (auto it = v.begin(); it != v.end(); ++it) {
-        if (it.value().userType() == QVariant::Map) {
+        if (it.value().userType() == QMetaType::QVariantMap) {
             obj.setProperty(it.key(), toScriptValue(engine, productName, it.value().toMap(),
                     depName, QualifiedId(moduleName) << it.key()));
         } else {
diff --git a/src/lib/corelib/jsextensions/propertylistutils.mm b/src/lib/corelib/jsextensions/propertylistutils.mm
index 6d039661d..704b1a8ce 100644
--- a/src/lib/corelib/jsextensions/propertylistutils.mm
+++ b/src/lib/corelib/jsextensions/propertylistutils.mm
@@ -127,33 +127,33 @@ static NSArray *toArray(const QVariantList &list);
 
 static id toObject(const QVariant &variant)
 {
-    if (variant.userType() == QVariant::Hash) {
+    if (variant.userType() == QMetaType::QVariantHash) {
         return toDictionary(qHashToMap(variant.toHash()));
-    } else if (variant.userType() == QVariant::Map) {
+    } else if (variant.userType() == QMetaType::QVariantMap) {
         return toDictionary(variant.toMap());
-    } else if (variant.userType() == QVariant::List) {
+    } else if (variant.userType() == QMetaType::QVariantList) {
         return toArray(variant.toList());
-    } else if (variant.userType() == QVariant::String) {
+    } else if (variant.userType() == QMetaType::QString) {
         return variant.toString().toNSString();
-    } else if (variant.userType() == QVariant::ByteArray) {
+    } else if (variant.userType() == QMetaType::QByteArray) {
         return variant.toByteArray().toNSData();
-    } else if (variant.userType() == QVariant::Date ||
-               variant.userType() == QVariant::DateTime) {
+    } else if (variant.userType() == QMetaType::QDate ||
+               variant.userType() == QMetaType::QDateTime) {
         return variant.toDateTime().toNSDate();
-    } else if (variant.userType() == QVariant::Bool) {
+    } else if (variant.userType() == QMetaType::Bool) {
         return variant.toBool()
                 ? [NSNumber numberWithBool:YES]
                 : [NSNumber numberWithBool:NO];
-    } else if (variant.userType() == QVariant::Char ||
-               variant.userType() == QVariant::Int) {
+    } else if (variant.userType() == QMetaType::Char ||
+               variant.userType() == QMetaType::Int) {
         return [NSNumber numberWithInt:variant.toInt()];
-    } else if (variant.userType() == QVariant::UInt) {
+    } else if (variant.userType() == QMetaType::UInt) {
         return [NSNumber numberWithUnsignedInt:variant.toUInt()];
-    } else if (variant.userType() == QVariant::LongLong) {
+    } else if (variant.userType() == QMetaType::LongLong) {
         return [NSNumber numberWithLongLong:variant.toLongLong()];
-    } else if (variant.userType() == QVariant::ULongLong) {
+    } else if (variant.userType() == QMetaType::ULongLong) {
         return [NSNumber numberWithUnsignedLongLong:variant.toULongLong()];
-    } else if (variant.userType() == QVariant::Double) {
+    } else if (variant.userType() == QMetaType::Double) {
         return [NSNumber numberWithDouble:variant.toDouble()];
     } else {
         return [NSNull null];
diff --git a/src/lib/corelib/language/moduleloader.cpp b/src/lib/corelib/language/moduleloader.cpp
index 241670124..591a3df34 100644
--- a/src/lib/corelib/language/moduleloader.cpp
+++ b/src/lib/corelib/language/moduleloader.cpp
@@ -1544,7 +1544,7 @@ private:
     void check(const QVariantMap &parameters, const QualifiedId &moduleName) const
     {
         for (auto it = parameters.begin(); it != parameters.end(); ++it) {
-            if (it.value().userType() == QVariant::Map) {
+            if (it.value().userType() == QMetaType::QVariantMap) {
                 check(it.value().toMap(), QualifiedId(moduleName) << it.key());
             } else {
                 const auto &deps = m_productItem->modules();
@@ -1942,7 +1942,7 @@ void ModuleLoader::printProfilingInfo()
 static void mergeParameters(QVariantMap &dst, const QVariantMap &src)
 {
     for (auto it = src.begin(); it != src.end(); ++it) {
-        if (it.value().userType() == QVariant::Map) {
+        if (it.value().userType() == QMetaType::QVariantMap) {
             QVariant &vdst = dst[it.key()];
             QVariantMap mdst = vdst.toMap();
             mergeParameters(mdst, it.value().toMap());
@@ -3207,30 +3207,30 @@ QStringList &ModuleLoader::getModuleFileNames(const QString &dirPath)
     return moduleFileNames;
 }
 
-// returns QVariant::Invalid for types that do not need conversion
-static QVariant::Type variantType(PropertyDeclaration::Type t)
+// returns QMetaType::UnknownType for types that do not need conversion
+static QMetaType::Type variantType(PropertyDeclaration::Type t)
 {
     switch (t) {
     case PropertyDeclaration::UnknownType:
         break;
     case PropertyDeclaration::Boolean:
-        return QVariant::Bool;
+        return QMetaType::Bool;
     case PropertyDeclaration::Integer:
-        return QVariant::Int;
+        return QMetaType::Int;
     case PropertyDeclaration::Path:
-        return QVariant::String;
+        return QMetaType::QString;
     case PropertyDeclaration::PathList:
-        return QVariant::StringList;
+        return QMetaType::QStringList;
     case PropertyDeclaration::String:
-        return QVariant::String;
+        return QMetaType::QString;
     case PropertyDeclaration::StringList:
-        return QVariant::StringList;
+        return QMetaType::QStringList;
     case PropertyDeclaration::VariantList:
-        return QVariant::List;
+        return QMetaType::QVariantList;
     case PropertyDeclaration::Variant:
         break;
     }
-    return QVariant::Invalid;
+    return QMetaType::UnknownType;
 }
 
 static QVariant convertToPropertyType(const QVariant &v, PropertyDeclaration::Type t,
@@ -3238,12 +3238,12 @@ static QVariant convertToPropertyType(const QVariant &v, PropertyDeclaration::Ty
 {
     if (v.isNull() || !v.isValid())
         return v;
-    const QVariant::Type vt = variantType(t);
-    if (vt == QVariant::Invalid)
+    const auto vt = variantType(t);
+    if (vt == QMetaType::UnknownType)
         return v;
 
     // Handle the foo,bar,bla stringlist syntax.
-    if (t == PropertyDeclaration::StringList && v.userType() == QVariant::String)
+    if (t == PropertyDeclaration::StringList && v.userType() == QMetaType::QString)
         return v.toString().split(QLatin1Char(','));
 
     QVariant c = v;
diff --git a/src/lib/corelib/logging/logger.cpp b/src/lib/corelib/logging/logger.cpp
index 4b5f652e1..d4020892f 100644
--- a/src/lib/corelib/logging/logger.cpp
+++ b/src/lib/corelib/logging/logger.cpp
@@ -163,7 +163,7 @@ LogWriter operator<<(LogWriter w, const Internal::Set<QString> &strSet)
 LogWriter operator<<(LogWriter w, const QVariant &variant)
 {
     QString str = QLatin1String(variant.typeName()) + QLatin1Char('(');
-    if (variant.userType() == QVariant::List) {
+    if (variant.userType() == QMetaType::QVariantList) {
         bool firstLoop = true;
         const auto list = variant.toList();
         for (const QVariant &item : list) {
diff --git a/src/lib/corelib/tools/jsliterals.cpp b/src/lib/corelib/tools/jsliterals.cpp
index 86d5324f3..bc6112a27 100644
--- a/src/lib/corelib/tools/jsliterals.cpp
+++ b/src/lib/corelib/tools/jsliterals.cpp
@@ -75,7 +75,7 @@ QString toJSLiteral(const QVariant &val)
 {
     if (!val.isValid())
         return Internal::StringConstants::undefinedValue();
-    if (val.userType() == QVariant::List || val.userType() == QVariant::StringList) {
+    if (val.userType() == QMetaType::QVariantList || val.userType() == QMetaType::QStringList) {
         QString res;
         const auto list = val.toList();
         for (const QVariant &child : list) {
@@ -86,7 +86,7 @@ QString toJSLiteral(const QVariant &val)
         res.append(QLatin1Char(']'));
         return res;
     }
-    if (val.userType() == QVariant::Map) {
+    if (val.userType() == QMetaType::QVariantMap) {
         const QVariantMap &vm = val.toMap();
         QString str = QStringLiteral("{");
         for (QVariantMap::const_iterator it = vm.begin(); it != vm.end(); ++it) {
@@ -97,9 +97,9 @@ QString toJSLiteral(const QVariant &val)
         str += QLatin1Char('}');
         return str;
     }
-    if (val.userType() == QVariant::Bool)
+    if (val.userType() == QMetaType::Bool)
         return toJSLiteral(val.toBool());
-    if (val.canConvert(QVariant::String))
+    if (val.canConvert(QMetaType::QString))
         return toJSLiteral(val.toString());
     return QStringLiteral("Unconvertible type %1").arg(QLatin1String(val.typeName()));
 }
diff --git a/src/lib/corelib/tools/settingscreator.cpp b/src/lib/corelib/tools/settingscreator.cpp
index 618098fbf..3fdaf0bc3 100644
--- a/src/lib/corelib/tools/settingscreator.cpp
+++ b/src/lib/corelib/tools/settingscreator.cpp
@@ -109,11 +109,11 @@ void SettingsCreator::migrate()
     const auto allKeys = m_settings->allKeys();
     for (const QString &key : allKeys) {
         QVariant v = m_settings->value(key);
-        if (v.userType() == QVariant::String) {
+        if (v.userType() == QMetaType::QString) {
             QString s = v.toString();
             if (s.contains(oldProfilesDir))
                 m_settings->setValue(key, s.replace(oldProfilesDir, newProfilesDir));
-        } else if (v.userType() == QVariant::StringList) {
+        } else if (v.userType() == QMetaType::QStringList) {
             const QStringList oldList = v.toStringList();
             QStringList newList;
             for (const QString &oldString : oldList) {
diff --git a/src/lib/msbuild/io/msbuildprojectwriter.cpp b/src/lib/msbuild/io/msbuildprojectwriter.cpp
index a80008dc0..aaab11aa6 100644
--- a/src/lib/msbuild/io/msbuildprojectwriter.cpp
+++ b/src/lib/msbuild/io/msbuildprojectwriter.cpp
@@ -178,7 +178,7 @@ void MSBuildProjectWriterPrivate::visitEnd(const MSBuildItemGroup *)
 void MSBuildProjectWriterPrivate::visitStart(const MSBuildItemMetadata *itemMetadata)
 {
     QString stringValue;
-    if (itemMetadata->value().userType() == QVariant::Bool) {
+    if (itemMetadata->value().userType() == QMetaType::Bool) {
         stringValue = itemMetadata->value().toBool()
                 ? QStringLiteral("True")
                 : QStringLiteral("False");
@@ -210,7 +210,7 @@ void MSBuildProjectWriterPrivate::visitEnd(const MSBuildProject *)
 void MSBuildProjectWriterPrivate::visitStart(const MSBuildProperty *property)
 {
     QString stringValue;
-    if (property->value().userType() == QVariant::Bool)
+    if (property->value().userType() == QMetaType::Bool)
         stringValue = property->value().toBool() ? QStringLiteral("True") : QStringLiteral("False");
     else
         stringValue = property->value().toString();