Fix deprecation warnings related to QMetaType

Change-Id: I4e6c1b03915c33f6225c0fb7f86e6acb7715cd4d
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

5 files changed, 8 insertions, 8 deletions

diff --git a/src/imports/controls/material/qquickmaterialstyle.cpp b/src/imports/controls/material/qquickmaterialstyle.cpp
index d343f2f5..a130db6c 100644
--- a/src/imports/controls/material/qquickmaterialstyle.cpp
+++ b/src/imports/controls/material/qquickmaterialstyle.cpp
@@ -1356,7 +1356,7 @@ void QQuickMaterialStyle::attachedParentChange(QQuickAttachedObject *newParent,
 bool QQuickMaterialStyle::variantToRgba(const QVariant &var, const char *name, QRgb *rgba, bool *custom) const
 {
     *custom = false;
-    if (var.type() == QVariant::Int) {
+    if (var.metaType().id() == QMetaType::Int) {
         int val = var.toInt();
         if (val > BlueGrey) {
             qmlWarning(parent()) << "unknown Material." << name << " value: " << val;
diff --git a/src/imports/controls/universal/qquickuniversalstyle.cpp b/src/imports/controls/universal/qquickuniversalstyle.cpp
index d46752f3..605cfce2 100644
--- a/src/imports/controls/universal/qquickuniversalstyle.cpp
+++ b/src/imports/controls/universal/qquickuniversalstyle.cpp
@@ -592,7 +592,7 @@ void QQuickUniversalStyle::initGlobals()
 
 bool QQuickUniversalStyle::variantToRgba(const QVariant &var, const char *name, QRgb *rgba) const
 {
-    if (var.type() == QVariant::Int) {
+    if (var.metaType().id() == QMetaType::Int) {
         int val = var.toInt();
         if (val < Lime || val > Taupe) {
             qmlWarning(parent()) << "unknown Universal." << name << " value: " << val;
diff --git a/src/imports/nativestyle/qstyle/windows/qquickwindowsstyle.cpp b/src/imports/nativestyle/qstyle/windows/qquickwindowsstyle.cpp
index 7a16216d..45b2c79f 100644
--- a/src/imports/nativestyle/qstyle/windows/qquickwindowsstyle.cpp
+++ b/src/imports/nativestyle/qstyle/windows/qquickwindowsstyle.cpp
@@ -112,7 +112,7 @@ bool QWindowsStylePrivate::isDarkMode()
     // dark mode is in effect.
     if (auto ni = QGuiApplication::platformNativeInterface()) {
         const QVariant darkModeStyleP = ni->property("darkModeStyle");
-        result = darkModeStyleP.type() == QVariant::Bool
+        result = darkModeStyleP.metaType().id() == QMetaType::Bool
                  && darkModeStyleP.value<bool>()
                  && ni->property("darkMode").value<bool>();
     }
diff --git a/src/imports/platform/qquickplatformmenuitem.cpp b/src/imports/platform/qquickplatformmenuitem.cpp
index 9595a7cc..3916e4ad 100644
--- a/src/imports/platform/qquickplatformmenuitem.cpp
+++ b/src/imports/platform/qquickplatformmenuitem.cpp
@@ -124,7 +124,7 @@ QQuickPlatformMenuItem::~QQuickPlatformMenuItem()
 #if QT_CONFIG(shortcut)
     if (m_shortcutId != -1) {
         QKeySequence sequence;
-        if (m_shortcut.type() == QVariant::Int)
+        if (m_shortcut.metaType().id() == QMetaType::Int)
             sequence = QKeySequence(static_cast<QKeySequence::StandardKey>(m_shortcut.toInt()));
         else
             sequence = QKeySequence::fromString(m_shortcut.toString());
@@ -186,7 +186,7 @@ void QQuickPlatformMenuItem::sync()
 
 #if QT_CONFIG(shortcut)
     QKeySequence sequence;
-    if (m_shortcut.type() == QVariant::Int)
+    if (m_shortcut.metaType().id() == QMetaType::Int)
         sequence = QKeySequence(static_cast<QKeySequence::StandardKey>(m_shortcut.toInt()));
     else
         sequence = QKeySequence::fromString(m_shortcut.toString());
@@ -503,7 +503,7 @@ void QQuickPlatformMenuItem::setShortcut(const QVariant& shortcut)
 #if QT_CONFIG(shortcut)
     if (m_shortcutId != -1) {
         QKeySequence sequence;
-        if (m_shortcut.type() == QVariant::Int)
+        if (m_shortcut.metaType().id() == QMetaType::Int)
             sequence = QKeySequence(static_cast<QKeySequence::StandardKey>(m_shortcut.toInt()));
         else
             sequence = QKeySequence::fromString(m_shortcut.toString());
@@ -514,7 +514,7 @@ void QQuickPlatformMenuItem::setShortcut(const QVariant& shortcut)
     sync();
 #if QT_CONFIG(shortcut)
     QKeySequence sequence;
-    if (m_shortcut.type() == QVariant::Int)
+    if (m_shortcut.metaType().id() == QMetaType::Int)
         sequence = QKeySequence(static_cast<QKeySequence::StandardKey>(m_shortcut.toInt()));
     else
         sequence = QKeySequence::fromString(m_shortcut.toString());
diff --git a/src/quicktemplates2/qquickaction.cpp b/src/quicktemplates2/qquickaction.cpp
index 0dab3b97..365c4bee 100644
--- a/src/quicktemplates2/qquickaction.cpp
+++ b/src/quicktemplates2/qquickaction.cpp
@@ -118,7 +118,7 @@ QT_BEGIN_NAMESPACE
 #if QT_CONFIG(shortcut)
 static QKeySequence variantToKeySequence(const QVariant &var)
 {
-    if (var.type() == QVariant::Int)
+    if (var.metaType().id() == QMetaType::Int)
         return QKeySequence(static_cast<QKeySequence::StandardKey>(var.toInt()));
     return QKeySequence::fromString(var.toString());
 }