Fix QMetaType::type() related deprecation warnings

Not in sdktool, which still builds with Qt 5.15

Change-Id: I6e6f4331127b821e471e2840e7959cd65e6419e9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>

10 files changed, 13 insertions, 13 deletions

diff --git a/src/plugins/qmldesigner/components/collectioneditor/datastoremodelnode.cpp b/src/plugins/qmldesigner/components/collectioneditor/datastoremodelnode.cpp
index 5be9c20f9ed..0d7b0976e50 100644
--- a/src/plugins/qmldesigner/components/collectioneditor/datastoremodelnode.cpp
+++ b/src/plugins/qmldesigner/components/collectioneditor/datastoremodelnode.cpp
@@ -493,7 +493,7 @@ void DataStoreModelNode::assignCollectionToNode(AbstractView *view,
             const QVariant currentTextRoleValue = textRoleProperty.value();
 
             if (currentTextRoleValue.isValid() && !currentTextRoleValue.isNull()) {
-                if (currentTextRoleValue.type() == QVariant::String) {
+                if (currentTextRoleValue.typeId() == QMetaType::QString) {
                     const QString currentTextRole = currentTextRoleValue.toString();
                     if (collectionHasColumn(collectionName, currentTextRole))
                         return;
diff --git a/src/plugins/qmldesigner/components/componentcore/propertycomponentgenerator.cpp b/src/plugins/qmldesigner/components/componentcore/propertycomponentgenerator.cpp
index 8cc84058d20..e7e56e72b98 100644
--- a/src/plugins/qmldesigner/components/componentcore/propertycomponentgenerator.cpp
+++ b/src/plugins/qmldesigner/components/componentcore/propertycomponentgenerator.cpp
@@ -37,7 +37,7 @@ Type getProperty(const QmlJS::SimpleReaderNode *node, const QString &name)
 {
     if (auto property = node->property(name)) {
         const auto &value = property.value;
-        if (value.type() == QVariant::List) {
+        if (value.typeId() == QMetaType::QVariantList) {
             auto list = value.toList();
             if (list.size())
                 return list.front().value<Type>();
diff --git a/src/plugins/qmldesigner/components/listmodeleditor/listmodeleditormodel.cpp b/src/plugins/qmldesigner/components/listmodeleditor/listmodeleditormodel.cpp
index b6009edc774..6ab97b4307c 100644
--- a/src/plugins/qmldesigner/components/listmodeleditor/listmodeleditormodel.cpp
+++ b/src/plugins/qmldesigner/components/listmodeleditor/listmodeleditormodel.cpp
@@ -32,7 +32,7 @@ public:
         if (value.typeId() == QVariant::Bool)
             return value;
 
-        if (value.typeId() == QVariant::String) {
+        if (value.typeId() == QMetaType::QString) {
             const QString text = value.toString();
             if (text == "true")
                 return QVariant(true);
diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp
index 70686f31ae9..f731d6803b1 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp
@@ -60,10 +60,10 @@ static bool cleverColorCompare(const QVariant &value1, const QVariant &value2)
         return c1.name() == c2.name() && c1.alpha() == c2.alpha();
     }
 
-    if (value1.typeId() == QVariant::String && value2.typeId() == QVariant::Color)
+    if (value1.typeId() == QMetaType::QString && value2.typeId() == QVariant::Color)
         return cleverColorCompare(QVariant(QColor(value1.toString())), value2);
 
-    if (value1.typeId() == QVariant::Color && value2.typeId() == QVariant::String)
+    if (value1.typeId() == QVariant::Color && value2.typeId() == QMetaType::QString)
         return cleverColorCompare(value1, QVariant(QColor(value2.toString())));
 
     return false;
diff --git a/src/plugins/qmldesigner/components/timelineeditor/timelinesettingsmodel.cpp b/src/plugins/qmldesigner/components/timelineeditor/timelinesettingsmodel.cpp
index 39c1f01ce6d..9b85599ead6 100644
--- a/src/plugins/qmldesigner/components/timelineeditor/timelinesettingsmodel.cpp
+++ b/src/plugins/qmldesigner/components/timelineeditor/timelinesettingsmodel.cpp
@@ -68,7 +68,7 @@ TimelineEditorDelegate::TimelineEditorDelegate(QWidget *parent)
     if (factory == nullptr) {
         factory = new QItemEditorFactory;
         QItemEditorCreatorBase *creator = new QItemEditorCreator<QComboBox>("currentText");
-        factory->registerEditor(QVariant::String, creator);
+        factory->registerEditor(QMetaType::QString, creator);
     }
 
     setItemEditorFactory(factory);
diff --git a/src/plugins/qmldesigner/designercore/metainfo/metainforeader.cpp b/src/plugins/qmldesigner/designercore/metainfo/metainforeader.cpp
index af61ef65735..0addc6884d2 100644
--- a/src/plugins/qmldesigner/designercore/metainfo/metainforeader.cpp
+++ b/src/plugins/qmldesigner/designercore/metainfo/metainforeader.cpp
@@ -272,7 +272,7 @@ inline QString deEscape(const QString &value)
 
 inline QVariant deEscapeVariant(const QVariant &value)
 {
-    if (value.typeId() == QVariant::String)
+    if (value.typeId() == QMetaType::QString)
         return deEscape(value.toString());
     return value;
 }
diff --git a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
index b8c3e610be5..3e9513ae3c7 100644
--- a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
+++ b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
@@ -3504,7 +3504,7 @@ QVariant PropertyMetaInfo::castedValue(const QVariant &value) const
             return variant;
         } else if (typeId == QVariant::UserType && typeName == "var") {
             return variant;
-        } else if (variant.typeId() == QVariant::List) {
+        } else if (variant.typeId() == QMetaType::QVariantList) {
             // TODO: check the contents of the list
             return variant;
         } else if (typeName == "var" || typeName == "variant") {
diff --git a/src/plugins/qmldesigner/designercore/model/propertycontainer.cpp b/src/plugins/qmldesigner/designercore/model/propertycontainer.cpp
index cd7cebbb73a..8eaa7947deb 100644
--- a/src/plugins/qmldesigner/designercore/model/propertycontainer.cpp
+++ b/src/plugins/qmldesigner/designercore/model/propertycontainer.cpp
@@ -41,7 +41,7 @@ PropertyName PropertyContainer::name() const
 
 QVariant PropertyContainer::value() const
 {
-    if (m_value.typeId() == QVariant::String)
+    if (m_value.typeId() == QMetaType::QString)
         m_value = PropertyParser::read(m_type, m_value.toString());
     return m_value;
 }
diff --git a/src/plugins/qmldesigner/designercore/model/rewriterview.cpp b/src/plugins/qmldesigner/designercore/model/rewriterview.cpp
index 17d40daca3e..88a3de7e094 100644
--- a/src/plugins/qmldesigner/designercore/model/rewriterview.cpp
+++ b/src/plugins/qmldesigner/designercore/model/rewriterview.cpp
@@ -593,7 +593,7 @@ QString RewriterView::auxiliaryDataAsQML() const
                 hasAuxData = true;
                 QString strValue = value.toString();
 
-                auto metaType = static_cast<QMetaType::Type>(value.type());
+                const int metaType = value.typeId();
 
                 if (metaType == QMetaType::QString
                         || metaType == QMetaType::QColor) {
diff --git a/src/plugins/qmldesigner/designercore/projectstorage/typeannotationreader.cpp b/src/plugins/qmldesigner/designercore/projectstorage/typeannotationreader.cpp
index 67a63542bcb..e283d849a47 100644
--- a/src/plugins/qmldesigner/designercore/projectstorage/typeannotationreader.cpp
+++ b/src/plugins/qmldesigner/designercore/projectstorage/typeannotationreader.cpp
@@ -304,7 +304,7 @@ QString deEscape(const QString &value)
 
 QVariant deEscapeVariant(const QVariant &value)
 {
-    if (value.typeId() == QVariant::String)
+    if (value.typeId() == QMetaType::QString)
         return deEscape(value.toString());
     return value;
 }
@@ -459,9 +459,9 @@ using json = nlohmann::json;
     out = json::array({});
     out.push_back(property.name);
     out.push_back(property.type);
-    if (property.value.type() == QVariant::String)
+    if (property.value.typeId() == QMetaType::QString)
         out.push_back(Utils::PathString{property.value.toString()});
-    else if (property.value.type() == QVariant::Int || property.value.type() == QVariant::LongLong)
+    else if (property.value.typeId() == QMetaType::Int || property.value.typeId() == QMetaType::LongLong)
         out.push_back(property.value.toLongLong());
     else
         out.push_back(property.value.toDouble());