Use QMetaType::Type instead of the deprecated QVariant::Type

Change-Id: I8b4ee32e36ea024392f85d5cf1b7b03a84a56e7b
Reviewed-by: Bea Lam <bea.lam@jollamobile.com>

24 files changed, 125 insertions, 124 deletions

diff --git a/src/contacts/qcontactmanager.cpp b/src/contacts/qcontactmanager.cpp
index 5d7b4347e..33d907f1c 100644
--- a/src/contacts/qcontactmanager.cpp
+++ b/src/contacts/qcontactmanager.cpp
@@ -754,7 +754,7 @@ bool QContactManager::removeRelationships(const QList<QContactRelationship> &rel
 /*!
   Returns the list of data types supported by the manager
  */
-QList<QVariant::Type> QContactManager::supportedDataTypes() const
+QList<QMetaType::Type> QContactManager::supportedDataTypes() const
 {
     return d->m_engine->supportedDataTypes();
 }
diff --git a/src/contacts/qcontactmanager.h b/src/contacts/qcontactmanager.h
index 5621b64c8..053b72eb9 100644
--- a/src/contacts/qcontactmanager.h
+++ b/src/contacts/qcontactmanager.h
@@ -150,7 +150,7 @@ public:
 
     /* Capabilities reporting */
     bool isRelationshipTypeSupported(const QString& relationshipType, QContactType::TypeValues  contactType = QContactType::TypeContact) const;
-    QList<QVariant::Type> supportedDataTypes() const;
+    QList<QMetaType::Type> supportedDataTypes() const;
     bool isFilterSupported(const QContactFilter& filter) const;
     QList<QContactType::TypeValues> supportedContactTypes() const;
     QList<QContactDetail::DetailType> supportedContactDetailTypes() const;
diff --git a/src/contacts/qcontactmanagerengine.cpp b/src/contacts/qcontactmanagerengine.cpp
index 670fb0ecc..e1f47d725 100644
--- a/src/contacts/qcontactmanagerengine.cpp
+++ b/src/contacts/qcontactmanagerengine.cpp
@@ -687,9 +687,9 @@ bool QContactManagerEngine::isFilterSupported(const QContactFilter& filter) cons
 /*!
   Returns the list of data types supported by this engine.
  */
-QList<QVariant::Type> QContactManagerEngine::supportedDataTypes() const
+QList<QMetaType::Type> QContactManagerEngine::supportedDataTypes() const
 {
-    return QList<QVariant::Type>();
+    return QList<QMetaType::Type>();
 }
 
 /*!
@@ -1116,7 +1116,7 @@ static inline int compareStrings(const QString& left, const QString& right, Qt::
 
 /*!
   Compares \a first against \a second.  If the types are
-  strings (QVariant::String), the \a sensitivity argument controls
+  strings (QMetaType::QString), the \a sensitivity argument controls
   case sensitivity when comparing.  Also, when comparing strings,
   a locale aware comparison is used, and if the sensitivity is
   CaseSensitive, strings that are identical under a case insensitive
@@ -1148,69 +1148,70 @@ static inline int compareStrings(const QString& left, const QString& right, Qt::
  */
 int QContactManagerEngine::compareVariant(const QVariant& first, const QVariant& second, Qt::CaseSensitivity sensitivity)
 {
-    switch(first.type()) {
-        case QVariant::Int:
+    switch (first.metaType().id()) {
+        case QMetaType::Int:
             {
                 const int a = first.toInt();
                 const int b = second.toInt();
                 return (a < b) ? -1 : ((a == b) ? 0 : 1);
             }
 
-        case QVariant::LongLong:
+        case QMetaType::LongLong:
             {
                 const qlonglong a = first.toLongLong();
                 const qlonglong b = second.toLongLong();
                 return (a < b) ? -1 : ((a == b) ? 0 : 1);
             }
 
-        case QVariant::Bool:
-        case QVariant::UInt:
+        case QMetaType::Bool:
+        case QMetaType::UInt:
             {
                 const uint a = first.toUInt();
                 const uint b = second.toUInt();
                 return (a < b) ? -1 : ((a == b) ? 0 : 1);
             }
 
-        case QVariant::ULongLong:
+        case QMetaType::ULongLong:
             {
                 const qulonglong a = first.toULongLong();
                 const qulonglong b = second.toULongLong();
                 return (a < b) ? -1 : ((a == b) ? 0 : 1);
             }
 
-        case QVariant::Char: // Needs to do proper string comparison
-        case QVariant::String:
+        case QMetaType::Char: // Needs to do proper string comparison
+        case QMetaType::QChar:
+        case QMetaType::QString:
             return compareStrings(first.toString(), second.toString(), sensitivity);
 
-        case QVariant::Double:
+        case QMetaType::Double:
             {
                 const double a = first.toDouble();
                 const double b = second.toDouble();
                 return (a < b) ? -1 : ((a == b) ? 0 : 1);
             }
 
-        case QVariant::DateTime:
+        case QMetaType::QDateTime:
             {
                 const QDateTime a = first.toDateTime();
                 const QDateTime b = second.toDateTime();
                 return (a < b) ? -1 : ((a == b) ? 0 : 1);
             }
 
-        case QVariant::Date:
+        case QMetaType::QDate:
             {
                 const QDate a = first.toDate();
                 const QDate b = second.toDate();
                 return (a < b) ? -1 : ((a == b) ? 0 : 1);
             }
 
-        case QVariant::Time:
+        case QMetaType::QTime:
             {
                 const QTime a = first.toTime();
                 const QTime b = second.toTime();
                 return (a < b) ? -1 : ((a == b) ? 0 : 1);
             }
 
-        case QVariant::StringList:
+        case QMetaType::QStringList:
             {
                 // We don't actually sort on these, I hope
                 // {} < {"aa"} < {"aa","bb"} < {"aa", "cc"} < {"bb"}
@@ -1718,10 +1719,10 @@ int QContactManagerEngine::compareContact(const QContact& a, const QContact& b,
         bool bIsNull = false;
 
         // treat empty strings as null qvariants.
-        if ((aVal.type() == QVariant::String && aVal.toString().isEmpty()) || aVal.isNull()) {
+        if ((aVal.metaType().id() == QMetaType::QString && aVal.toString().isEmpty()) || aVal.isNull()) {
             aIsNull = true;
         }
-        if ((bVal.type() == QVariant::String && bVal.toString().isEmpty()) || bVal.isNull()) {
+        if ((bVal.metaType().id() == QMetaType::QString && bVal.toString().isEmpty()) || bVal.isNull()) {
             bIsNull = true;
         }
 
diff --git a/src/contacts/qcontactmanagerengine.h b/src/contacts/qcontactmanagerengine.h
index dfac61c8a..14752bb6c 100644
--- a/src/contacts/qcontactmanagerengine.h
+++ b/src/contacts/qcontactmanagerengine.h
@@ -124,7 +124,7 @@ public:
     /* Capabilities reporting */
     virtual bool isRelationshipTypeSupported(const QString &relationshipType, QContactType::TypeValues contactType) const;
     virtual bool isFilterSupported(const QContactFilter &filter) const;
-    virtual QList<QVariant::Type> supportedDataTypes() const;
+    virtual QList<QMetaType::Type> supportedDataTypes() const;
     virtual QList<QContactType::TypeValues> supportedContactTypes() const;
     virtual QList<QContactDetail::DetailType> supportedContactDetailTypes() const;
 
diff --git a/src/imports/contacts/filters/qdeclarativecontactrelationshipfilter_p.h b/src/imports/contacts/filters/qdeclarativecontactrelationshipfilter_p.h
index d8866f2f5..79e3c11be 100644
--- a/src/imports/contacts/filters/qdeclarativecontactrelationshipfilter_p.h
+++ b/src/imports/contacts/filters/qdeclarativecontactrelationshipfilter_p.h
@@ -72,7 +72,7 @@ public:
     void setRelationshipType(const QVariant& v)
     {
         QString rt;
-        if (v.type() != QVariant::String) {
+        if (v.metaType().id() != QMetaType::QString) {
             switch (v.toInt()) {
             case QDeclarativeContactRelationship::HasMember:
                 rt = QContactRelationship::HasMember();
diff --git a/src/imports/contacts/qdeclarativecontactrelationship.cpp b/src/imports/contacts/qdeclarativecontactrelationship.cpp
index 19660a6b6..7e9df8c23 100644
--- a/src/imports/contacts/qdeclarativecontactrelationship.cpp
+++ b/src/imports/contacts/qdeclarativecontactrelationship.cpp
@@ -125,7 +125,7 @@ void QDeclarativeContactRelationship::setSecond(const QString& secondContactId)
 
 void QDeclarativeContactRelationship::setRelationshipType(const QVariant& relationshipType)
 {
-    if (relationshipType.type() == QVariant::Int) {
+    if (relationshipType.metaType().id() == QMetaType::Int) {
         switch (relationshipType.toInt()) {
         case QDeclarativeContactRelationship::HasMember:
             m_relationship.setRelationshipType(QContactRelationship::HasMember());
diff --git a/src/imports/organizer/qdeclarativeorganizeritemfilter.cpp b/src/imports/organizer/qdeclarativeorganizeritemfilter.cpp
index 56a25cf5b..c743ae854 100644
--- a/src/imports/organizer/qdeclarativeorganizeritemfilter.cpp
+++ b/src/imports/organizer/qdeclarativeorganizeritemfilter.cpp
@@ -555,7 +555,7 @@ QVariant QDeclarativeOrganizerItemDetailFieldFilter::value() const
 void QDeclarativeOrganizerItemDetailFieldFilter::setValue(const QVariant &newValue)
 {
     if (newValue != value()) {
-        if (QVariant::DateTime == newValue.type()) {
+        if (newValue.metaType().id() == QMetaType::QDateTime) {
             // handling dates and datetimes internally as UTC
             d.setValue(newValue.toDateTime().toUTC());
         } else {
diff --git a/src/imports/organizer/qdeclarativeorganizerrecurrencerule.cpp b/src/imports/organizer/qdeclarativeorganizerrecurrencerule.cpp
index 8216d18c5..116fc72f4 100644
--- a/src/imports/organizer/qdeclarativeorganizerrecurrencerule.cpp
+++ b/src/imports/organizer/qdeclarativeorganizerrecurrencerule.cpp
@@ -102,26 +102,26 @@ void QDeclarativeOrganizerRecurrenceRule::setLimit(const QVariant &value)
 {
     if (!value.isValid() ||
 #if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)
-        (static_cast<QMetaType::Type>(value.type()) == QMetaType::Nullptr) ||
+        (value.metaType().id() == QMetaType::Nullptr) ||
 #endif
-        (static_cast<QMetaType::Type>(value.type()) == QMetaType::VoidStar && value.value<void *>() == 0)) {
+        (value.metaType().id() == QMetaType::VoidStar && value.value<void *>() == 0)) {
         if (m_rule.limitType() != QOrganizerRecurrenceRule::NoLimit) {
             m_rule.clearLimit();
             emit recurrenceRuleChanged();
         }
-    } else if (value.type() == QVariant::DateTime) {
+    } else if (value.metaType().id() == QMetaType::QDateTime) {
         QDate v = value.toDateTime().toUTC().date();
         if (v != m_rule.limitDate()) {
             m_rule.setLimit(v);
             emit recurrenceRuleChanged();
         }
-    } else if (value.type() == QVariant::Date) {
+    } else if (value.metaType().id() == QMetaType::QDate) {
         QDate v = value.value<QDate>();
         if (v != m_rule.limitDate()) {
             m_rule.setLimit(v);
             emit recurrenceRuleChanged();
         }
-    }  else if ((value.type() == QVariant::Int) || (value.type() == QVariant::Double)) {
+    }  else if ((value.metaType().id() == QMetaType::Int) || (value.metaType().id() == QMetaType::Double)) {
         int v = value.value<int>();
         if (v != m_rule.limitCount()) {
             m_rule.setLimit(v);
diff --git a/src/organizer/qorganizermanagerengine.cpp b/src/organizer/qorganizermanagerengine.cpp
index 28183c750..97220d633 100644
--- a/src/organizer/qorganizermanagerengine.cpp
+++ b/src/organizer/qorganizermanagerengine.cpp
@@ -732,42 +732,42 @@ QOrganizerItemFilter QOrganizerManagerEngine::canonicalizedFilter(const QOrganiz
  */
 int QOrganizerManagerEngine::compareVariant(const QVariant& first, const QVariant& second, Qt::CaseSensitivity sensitivity)
 {
-    switch(first.type()) {
-        case QVariant::Int:
+    switch (first.metaType().id()) {
+        case QMetaType::Int:
             return first.toInt() - second.toInt();
 
-        case QVariant::LongLong:
+        case QMetaType::LongLong:
             return first.toLongLong() - second.toLongLong();
 
-        case QVariant::Bool:
-        case QVariant::Char:
-        case QVariant::UInt:
+        case QMetaType::Bool:
+        case QMetaType::Char:
+        case QMetaType::UInt:
             return first.toUInt() - second.toUInt();
 
-        case QVariant::ULongLong:
+        case QMetaType::ULongLong:
             return first.toULongLong() - second.toULongLong();
 
-       case QVariant::String:
+        case QMetaType::QString:
             return first.toString().compare(second.toString(), sensitivity);
 
-        case QVariant::Double:
+        case QMetaType::Double:
             {
                 const double a = first.toDouble();
                 const double b = second.toDouble();
                 return (a < b) ? -1 : ((a == b) ? 0 : 1);
             }
 
-        case QVariant::DateTime:
+        case QMetaType::QDateTime:
             {
                 const QDateTime a = first.toDateTime();
                 const QDateTime b = second.toDateTime();
                 return (a < b) ? -1 : ((a == b) ? 0 : 1);
             }
 
-        case QVariant::Date:
+        case QMetaType::QDate:
             return first.toDate().toJulianDay() - second.toDate().toJulianDay();
 
-        case QVariant::Time:
+        case QMetaType::QTime:
             {
                 const QTime a = first.toTime();
                 const QTime b = second.toTime();
@@ -1189,10 +1189,10 @@ int QOrganizerManagerEngine::compareItem(const QOrganizerItem& a, const QOrganiz
         bool bIsNull = false;
 
         // treat empty strings as null qvariants.
-        if ((aVal.type() == QVariant::String && aVal.toString().isEmpty()) || aVal.isNull()) {
+        if ((aVal.metaType().id() == QMetaType::QString && aVal.toString().isEmpty()) || aVal.isNull()) {
             aIsNull = true;
         }
-        if ((bVal.type() == QVariant::String && bVal.toString().isEmpty()) || bVal.isNull()) {
+        if ((bVal.metaType().id() == QMetaType::QString && bVal.toString().isEmpty()) || bVal.isNull()) {
             bIsNull = true;
         }
 
diff --git a/src/plugins/contacts/memory/qcontactmemorybackend.cpp b/src/plugins/contacts/memory/qcontactmemorybackend.cpp
index 5cba6762e..b75db8a8f 100644
--- a/src/plugins/contacts/memory/qcontactmemorybackend.cpp
+++ b/src/plugins/contacts/memory/qcontactmemorybackend.cpp
@@ -948,20 +948,20 @@ bool QContactMemoryEngine::isRelationshipTypeSupported(const QString& relationsh
 /*!
  * \reimp
  */
-QList<QVariant::Type> QContactMemoryEngine::supportedDataTypes() const
+QList<QMetaType::Type> QContactMemoryEngine::supportedDataTypes() const
 {
-    QList<QVariant::Type> st;
-    st.append(QVariant::String);
-    st.append(QVariant::Date);
-    st.append(QVariant::DateTime);
-    st.append(QVariant::Time);
-    st.append(QVariant::Bool);
-    st.append(QVariant::Char);
-    st.append(QVariant::Int);
-    st.append(QVariant::UInt);
-    st.append(QVariant::LongLong);
-    st.append(QVariant::ULongLong);
-    st.append(QVariant::Double);
+    QList<QMetaType::Type> st;
+    st.append(QMetaType::QString);
+    st.append(QMetaType::QDate);
+    st.append(QMetaType::QDateTime);
+    st.append(QMetaType::QTime);
+    st.append(QMetaType::Bool);
+    st.append(QMetaType::Char);
+    st.append(QMetaType::Int);
+    st.append(QMetaType::UInt);
+    st.append(QMetaType::LongLong);
+    st.append(QMetaType::ULongLong);
+    st.append(QMetaType::Double);
 
     return st;
 }
diff --git a/src/plugins/contacts/memory/qcontactmemorybackend_p.h b/src/plugins/contacts/memory/qcontactmemorybackend_p.h
index 22ce7a650..7e124a329 100644
--- a/src/plugins/contacts/memory/qcontactmemorybackend_p.h
+++ b/src/plugins/contacts/memory/qcontactmemorybackend_p.h
@@ -185,7 +185,7 @@ public:
     /* Capabilities reporting */
     virtual bool isRelationshipTypeSupported(const QString &relationshipType, QContactType::TypeValues contactType) const;
     virtual bool isFilterSupported(const QContactFilter &filter) const;
-    virtual QList<QVariant::Type> supportedDataTypes() const;
+    virtual QList<QMetaType::Type> supportedDataTypes() const;
     /*! \reimp */
     virtual QList<QContactType::TypeValues> supportedContactTypes() const
     {
diff --git a/src/plugins/versit/backuphandler/backupvcardhandler.cpp b/src/plugins/versit/backuphandler/backupvcardhandler.cpp
index 4cf424798..5dd28040e 100644
--- a/src/plugins/versit/backuphandler/backupvcardhandler.cpp
+++ b/src/plugins/versit/backuphandler/backupvcardhandler.cpp
@@ -213,41 +213,41 @@ void BackupVCardHandler::detailProcessed(
 void BackupVCardHandler::serializeValue(QVersitProperty* property, const QVariant& value)
 {
     // serialize the value
-    if (value.type() == QVariant::String
-        || value.type() == QVariant::ByteArray) {
+    if (value.metaType().id() == QMetaType::QString
+        || value.metaType().id() == QMetaType::QByteArray) {
         // store QStrings and QByteArrays as-is
         property->setValue(value);
-    } else if (value.type() == QVariant::Date) {
+    } else if (value.metaType().id() == QMetaType::QDate) {
         // Store a QDate as a string
         QString valueString(value.toDate().toString(Qt::ISODate));
         property->insertParameter(DatatypeParameter, DatatypeParameterDate);
         property->setValue(valueString);
-    } else if (value.type() == QVariant::Time) {
+    } else if (value.metaType().id() == QMetaType::QTime) {
         // Store a QTime as a string
         QString valueString(value.toTime().toString(Qt::ISODate));
         property->insertParameter(DatatypeParameter, DatatypeParameterTime);
         property->setValue(valueString);
-    } else if (value.type() == QVariant::DateTime) {
+    } else if (value.metaType().id() == QMetaType::QDateTime) {
         // Store a QDateTime as a string
         QString valueString(value.toDateTime().toString(Qt::ISODate));
         property->insertParameter(DatatypeParameter, DatatypeParameterDateTime);
         property->setValue(valueString);
-    } else if (value.type() == QVariant::Bool) {
+    } else if (value.metaType().id() == QMetaType::Bool) {
         // Store an int as a string
         QString valueString(QString::number(value.toBool() ? 1 : 0));
         property->insertParameter(DatatypeParameter, DatatypeParameterBool);
         property->setValue(valueString);
-    } else if (value.type() == QVariant::Int) {
+    } else if (value.metaType().id() == QMetaType::Int) {
         // Store an int as a string
         QString valueString(QString::number(value.toInt()));
         property->insertParameter(DatatypeParameter, DatatypeParameterInt);
         property->setValue(valueString);
-    } else if (value.type() == QVariant::UInt) {
+    } else if (value.metaType().id() == QMetaType::UInt) {
         // Store a uint as a string
         QString valueString(QString::number(value.toUInt()));
         property->insertParameter(DatatypeParameter, DatatypeParameterUInt);
         property->setValue(valueString);
-    } else if (value.type() == QVariant::Url) {
+    } else if (value.metaType().id() == QMetaType::QUrl) {
         // Store a QUrl as a string
         QString valueString(value.toUrl().toString());
         property->insertParameter(DatatypeParameter, DatatypeParameterUrl);
diff --git a/src/versit/qvcard21writer.cpp b/src/versit/qvcard21writer.cpp
index 7acce33ba..2698899f3 100644
--- a/src/versit/qvcard21writer.cpp
+++ b/src/versit/qvcard21writer.cpp
@@ -79,7 +79,7 @@ void QVCard21Writer::encodeVersitProperty(const QVersitProperty& property)
     encodeGroupsAndName(property);
     QMultiHash<QString,QString> parameters = property.parameters();
     QVariant variant(property.variantValue());
-    if (variant.type() == QVariant::Url) {
+    if (variant.metaType().id() == QMetaType::QUrl) {
         variant = QVariant(variant.toUrl().toString());
     }
 
@@ -88,7 +88,7 @@ void QVCard21Writer::encodeVersitProperty(const QVersitProperty& property)
 
     /* Structured values need to have their components backslash-escaped (in vCard 2.1, semicolons
        must be escaped for compound values and commas must be escaped for list values). */
-    if (variant.type() == QVariant::StringList) {
+    if (variant.metaType().id() == QMetaType::QStringList) {
         QStringList values = property.variantValue().toStringList();
         QString separator;
         if (property.valueType() == QVersitProperty::CompoundType) {
@@ -119,10 +119,10 @@ void QVCard21Writer::encodeVersitProperty(const QVersitProperty& property)
                 first = false;
             }
         }
-    } else if (variant.type() == QVariant::String) {
+    } else if (variant.metaType().id() == QMetaType::QString) {
         renderedValue = variant.toString();
         encodeVersitValue(parameters, renderedValue, false);
-    } else if (variant.type() == QVariant::ByteArray) {
+    } else if (variant.metaType().id() == QMetaType::QByteArray) {
         parameters.replace(QStringLiteral("ENCODING"), QStringLiteral("BASE64"));
         if (mCodecIsAsciiCompatible) // optimize by not converting to unicode
             renderedBytes = variant.toByteArray().toBase64();
@@ -139,7 +139,7 @@ void QVCard21Writer::encodeVersitProperty(const QVersitProperty& property)
         writeCrlf();
         QVersitDocument embeddedDocument = variant.value<QVersitDocument>();
         encodeVersitDocument(embeddedDocument);
-    } else if (variant.type() == QVariant::String || variant.type() == QVariant::StringList) {
+    } else if (variant.metaType().id() == QMetaType::QString || variant.metaType().id() == QMetaType::QStringList) {
         // Some devices don't support vCard-style line folding if the property is
         // quoted-printable-encoded.  Therefore, we use QP soft linebreaks if the property is being
         // QP-encoded, and normal vCard folding otherwise.
@@ -147,7 +147,7 @@ void QVCard21Writer::encodeVersitProperty(const QVersitProperty& property)
             writeStringQp(renderedValue);
         else
             writeString(renderedValue);
-    } else if (variant.type() == QVariant::ByteArray) {
+    } else if (variant.metaType().id() == QMetaType::QByteArray) {
         // One extra folding before the value and
         // one extra line break after the value are needed in vCard 2.1
         writeCrlf();
diff --git a/src/versit/qvcard30writer.cpp b/src/versit/qvcard30writer.cpp
index f632f9af4..508fd85bb 100644
--- a/src/versit/qvcard30writer.cpp
+++ b/src/versit/qvcard30writer.cpp
@@ -78,9 +78,9 @@ void QVCard30Writer::encodeVersitProperty(const QVersitProperty& property)
     encodeGroupsAndName(modifiedProperty);
 
     QVariant variant(modifiedProperty.variantValue());
-    if (variant.type() == QVariant::ByteArray) {
+    if (variant.metaType().id() == QMetaType::QByteArray) {
         modifiedProperty.insertParameter(QStringLiteral("ENCODING"), QStringLiteral("b"));
-    } else if (variant.type() == QVariant::Url) {
+    } else if (variant.metaType().id() == QMetaType::QUrl) {
         variant = QVariant(variant.toUrl().toString());
     }
     encodeParameters(modifiedProperty.parameters());
@@ -100,12 +100,12 @@ void QVCard30Writer::encodeVersitProperty(const QVersitProperty& property)
         QString documentString(mCodec->toUnicode(data));
         backSlashEscape(&documentString);
         renderedValue = documentString;
-    } else if (variant.type() == QVariant::String) {
+    } else if (variant.metaType().id() == QMetaType::QString) {
         renderedValue = variant.toString();
         if (property.valueType() != QVersitProperty::PreformattedType) {
             backSlashEscape(&renderedValue);
         }
-    } else if (variant.type() == QVariant::StringList) {
+    } else if (variant.metaType().id() == QMetaType::QStringList) {
         // We need to backslash escape and concatenate the values in the list
         QStringList values = property.variantValue().toStringList();
         QString separator;
@@ -130,7 +130,7 @@ void QVCard30Writer::encodeVersitProperty(const QVersitProperty& property)
                 first = false;
             }
         }
-    } else if (variant.type() == QVariant::ByteArray) {
+    } else if (variant.metaType().id() == QMetaType::QByteArray) {
         if (mCodecIsAsciiCompatible) // optimize by not converting to unicode
             renderedBytes = variant.toByteArray().toBase64();
         else
diff --git a/src/versit/qversitcontactexporter_p.cpp b/src/versit/qversitcontactexporter_p.cpp
index e2c618fe0..57481ca3b 100644
--- a/src/versit/qversitcontactexporter_p.cpp
+++ b/src/versit/qversitcontactexporter_p.cpp
@@ -498,9 +498,9 @@ void QVersitContactExporterPrivate::encodeBirthDay(
     property.setName(mPropertyMappings.value(detail.type()).second);
     QVariant variant = bday.value(QContactBirthday::FieldBirthday);
     QString value;
-    if (variant.type() == QVariant::Date) {
+    if (variant.metaType().id() == QMetaType::QDate) {
         value = variant.toDate().toString(Qt::ISODate);
-    } else if (variant.type() == QVariant::DateTime) {
+    } else if (variant.metaType().id() == QMetaType::QDateTime) {
         value = variant.toDateTime().toString(Qt::ISODate);
     } else {
         return;
diff --git a/src/versit/qversitcontactimporter_p.cpp b/src/versit/qversitcontactimporter_p.cpp
index e9a9ed8b9..c03c645bd 100644
--- a/src/versit/qversitcontactimporter_p.cpp
+++ b/src/versit/qversitcontactimporter_p.cpp
@@ -279,7 +279,7 @@ bool QVersitContactImporterPrivate::createName(
 
     QVariant variant = property.variantValue();
     if (property.valueType() != QVersitProperty::CompoundType
-            || variant.type() != QVariant::StringList)
+            || variant.metaType().id() != QMetaType::QStringList)
         return false;
     QStringList values = variant.toStringList();
     QString value(takeFirst(values));
@@ -351,7 +351,7 @@ bool QVersitContactImporterPrivate::createAddress(
 
     QVariant variant = property.variantValue();
     if (property.valueType() != QVersitProperty::CompoundType
-            || variant.type() != QVariant::StringList)
+            || variant.metaType().id() != QMetaType::QStringList)
         return false;
     QStringList addressParts = variant.toStringList();
     QString value(takeFirst(addressParts));
@@ -439,7 +439,7 @@ void QVersitContactImporterPrivate::setOrganizationNames(
 {
     QVariant variant = property.variantValue();
     if (property.valueType() == QVersitProperty::CompoundType
-        && variant.type() == QVariant::StringList) {
+        && variant.metaType().id() == QMetaType::QStringList) {
         QStringList values = variant.toStringList();
         QString name(takeFirst(values));
         if (!name.isEmpty())
@@ -496,7 +496,7 @@ bool QVersitContactImporterPrivate::createVersion(
 
     QVariant variant = property.variantValue();
     if (property.valueType() != QVersitProperty::CompoundType
-            || variant.type() != QVariant::StringList)
+            || variant.metaType().id() != QMetaType::QStringList)
         return false;
     QStringList values = variant.toStringList();
     bool ok;
@@ -589,7 +589,7 @@ bool QVersitContactImporterPrivate::createNicknames(
     Q_UNUSED(contact);
     QVariant variant = property.variantValue();
     if (property.valueType() != QVersitProperty::ListType
-            || variant.type() != QVariant::StringList)
+            || variant.metaType().id() != QMetaType::QStringList)
         return false;
     QStringList values = variant.toStringList();
     QList<int> contexts = extractContexts(property);
@@ -621,7 +621,7 @@ bool QVersitContactImporterPrivate::createTags(
     Q_UNUSED(contact);
     QVariant variant = property.variantValue();
     if (property.valueType() != QVersitProperty::ListType
-            || variant.type() != QVariant::StringList)
+            || variant.metaType().id() != QMetaType::QStringList)
         return false;
     QStringList values = variant.toStringList();
     QList<int> contexts = extractContexts(property);
@@ -764,7 +764,7 @@ bool QVersitContactImporterPrivate::createGeoLocation(
     QContactGeoLocation geo;
     QVariant variant = property.variantValue();
     if (property.valueType() != QVersitProperty::CompoundType
-            || variant.type() != QVariant::StringList)
+            || variant.metaType().id() != QMetaType::QStringList)
         return false;
     QStringList values = variant.toStringList();
     bool ok1;
@@ -797,7 +797,7 @@ bool QVersitContactImporterPrivate::createFamily(
     } else if (property.name() == QStringLiteral("X-CHILDREN")) {
         QVariant variant = property.variantValue();
         if (property.valueType() != QVersitProperty::ListType
-                || variant.type() != QVariant::StringList)
+                || variant.metaType().id() != QMetaType::QStringList)
             return false;
         QStringList values = variant.toStringList();
         if (values.isEmpty())
@@ -829,7 +829,7 @@ bool QVersitContactImporterPrivate::createFavorite(
     QContactFavorite favorite;
     QVariant variant = property.variantValue();
     if (property.valueType() != QVersitProperty::CompoundType
-            || variant.type() != QVariant::StringList)
+            || variant.metaType().id() != QMetaType::QStringList)
         return false;
 
     QStringList values = variant.toStringList();
@@ -907,7 +907,7 @@ bool QVersitContactImporterPrivate::createExtendedDetail(
     QContactExtendedDetail extendedDetail;
     const QVariant variant = property.variantValue();
     if (property.valueType() != QVersitProperty::CompoundType
-            || variant.type() != QVariant::StringList)
+            || variant.metaType().id() != QMetaType::QStringList)
         return false;
 
     QStringList values = variant.toStringList();
@@ -1034,12 +1034,12 @@ bool QVersitContactImporterPrivate::saveDataFromProperty(const QVersitProperty &
     bool found = false;
     const QString valueParam = property.parameters().value(QStringLiteral("VALUE")).toUpper();
     QVariant variant(property.variantValue());
-    if (variant.type() == QVariant::String
+    if (variant.metaType().id() == QMetaType::QString
         || valueParam == QStringLiteral("URL")
         || valueParam == QStringLiteral("URI")) {
         *location = property.value();
         found |= !location->isEmpty();
-    } else if (variant.type() == QVariant::ByteArray) {
+    } else if (variant.metaType().id() == QMetaType::QByteArray) {
         *data = variant.toByteArray();
         if (!data->isEmpty()) {
             found = true;
diff --git a/src/versit/qversitproperty.cpp b/src/versit/qversitproperty.cpp
index 59e3ab935..878a4f434 100644
--- a/src/versit/qversitproperty.cpp
+++ b/src/versit/qversitproperty.cpp
@@ -320,7 +320,7 @@ QVariant QVersitProperty::variantValue() const
  */
 QString QVersitProperty::value() const
 {
-    if (d->mValue.type() == QVariant::ByteArray) {
+    if (d->mValue.metaType().id() == QMetaType::QByteArray) {
         if (d->mParameters.contains(QStringLiteral("CHARSET"))) {
             QTextCodec* codec = QTextCodec::codecForName(
                     d->mParameters.value(QStringLiteral("CHARSET")).toLatin1());
diff --git a/src/versitorganizer/qversitorganizerimporter_p.cpp b/src/versitorganizer/qversitorganizerimporter_p.cpp
index 9379dc8cf..0df1ed022 100644
--- a/src/versitorganizer/qversitorganizerimporter_p.cpp
+++ b/src/versitorganizer/qversitorganizerimporter_p.cpp
@@ -272,7 +272,7 @@ bool QVersitOrganizerImporterPrivate::createVersion(
 
     QVariant variant = property.variantValue();
     if (property.valueType() != QVersitProperty::CompoundType
-            || variant.type() != QVariant::StringList) {
+            || variant.metaType().id() != QMetaType::QStringList) {
         return false;
     }
     QStringList values = variant.toStringList();
@@ -476,7 +476,7 @@ bool QVersitOrganizerImporterPrivate::createExtendedDetail(
     QOrganizerItemExtendedDetail extendedDetail;
     const QVariant variant = property.variantValue();
     if (property.valueType() != QVersitProperty::CompoundType
-            || variant.type() != QVariant::StringList)
+            || variant.metaType().id() != QMetaType::QStringList)
         return false;
 
     QStringList values = variant.toStringList();
diff --git a/tests/auto/contacts/qcontactasync/maliciousplugin/maliciousplugin_p.h b/tests/auto/contacts/qcontactasync/maliciousplugin/maliciousplugin_p.h
index 78798efba..ad6aaea73 100644
--- a/tests/auto/contacts/qcontactasync/maliciousplugin/maliciousplugin_p.h
+++ b/tests/auto/contacts/qcontactasync/maliciousplugin/maliciousplugin_p.h
@@ -141,7 +141,7 @@ public:
         return QContactManagerEngine::isFilterSupported(fil);
     }
 
-    QList<QVariant::Type> supportedDataTypes() const
+    QList<QMetaType::Type> supportedDataTypes() const
     {
         return QContactManagerEngine::supportedDataTypes();
     }
diff --git a/tests/auto/contacts/qcontactdetails/tst_qcontactdetails.cpp b/tests/auto/contacts/qcontactdetails/tst_qcontactdetails.cpp
index 65197506a..6c2e94f08 100644
--- a/tests/auto/contacts/qcontactdetails/tst_qcontactdetails.cpp
+++ b/tests/auto/contacts/qcontactdetails/tst_qcontactdetails.cpp
@@ -332,7 +332,7 @@ void tst_QContactDetails::birthday()
     b3.setDateTime(currDateTime);
     QCOMPARE(QContactDetail(b3).value(QContactBirthday::FieldBirthday), QVariant(currDateTime));
     b3.setDateTime(QDateTime(currDate, QTime(0,0,0,0)));
-    QCOMPARE(QContactDetail(b3).value(QContactBirthday::FieldBirthday).type(), QVariant::Date);    // unfortunate but unavoidable with current impl.
+    QCOMPARE(QContactDetail(b3).value(QContactBirthday::FieldBirthday).metaType().id(), QMetaType::QDate);    // unfortunate but unavoidable with current impl.
     QCOMPARE(QContactDetail(b3).value<QDateTime>(QContactBirthday::FieldBirthday), b3.dateTime());
 
     // test property add
diff --git a/tests/auto/contacts/qcontactmanagerplugins/dummyplugin/dummyplugin.cpp b/tests/auto/contacts/qcontactmanagerplugins/dummyplugin/dummyplugin.cpp
index 7923dfc48..b5593b928 100644
--- a/tests/auto/contacts/qcontactmanagerplugins/dummyplugin/dummyplugin.cpp
+++ b/tests/auto/contacts/qcontactmanagerplugins/dummyplugin/dummyplugin.cpp
@@ -192,12 +192,12 @@ QStringList DummyEngine::fastFilterableDefinitions() const
 /*!
  * Returns the list of data types supported by the vCard engine
  */
-QList<QVariant::Type> DummyEngine::supportedDataTypes() const
+QList<QMetaType::Type> DummyEngine::supportedDataTypes() const
 {
-    QList<QVariant::Type> st;
-    st.append(QVariant::String);
-    st.append(QVariant::Date);
-    st.append(QVariant::DateTime);
+    QList<QMetaType::Type> st;
+    st.append(QMetaType::QString);
+    st.append(QMetaType::QDate);
+    st.append(QMetaType::QDateTime);
 
     return st;
 }
diff --git a/tests/auto/contacts/qcontactmanagerplugins/dummyplugin/dummyplugin.h b/tests/auto/contacts/qcontactmanagerplugins/dummyplugin/dummyplugin.h
index c817f9055..cf16de610 100644
--- a/tests/auto/contacts/qcontactmanagerplugins/dummyplugin/dummyplugin.h
+++ b/tests/auto/contacts/qcontactmanagerplugins/dummyplugin/dummyplugin.h
@@ -57,7 +57,7 @@ public:
     /* Capabilities reporting */
     QStringList capabilities() const;
     QStringList fastFilterableDefinitions() const;
-    QList<QVariant::Type> supportedDataTypes() const;
+    QList<QMetaType::Type> supportedDataTypes() const;
 
     QMap<QString, QString> managerParameters() const {return QMap<QString, QString>();}
     int managerVersion() const {return 0;}
diff --git a/tests/auto/versit/qversitcontactexporter/tst_qversitcontactexporter.cpp b/tests/auto/versit/qversitcontactexporter/tst_qversitcontactexporter.cpp
index bdbeb4622..05980e95d 100644
--- a/tests/auto/versit/qversitcontactexporter/tst_qversitcontactexporter.cpp
+++ b/tests/auto/versit/qversitcontactexporter/tst_qversitcontactexporter.cpp
@@ -184,13 +184,13 @@ const QString TEST_AUDIO_FILE(QStringLiteral("versitTest001.wav"));
 #define CHECK_VALUE(property,expectedValueType,expectedValue) {\
     QCOMPARE(property.valueType(), expectedValueType); \
     QVariant value = property.variantValue(); \
-    QCOMPARE(value.type(), QVariant::StringList); \
+    QCOMPARE(value.metaType().id(), QMetaType::QStringList); \
     QCOMPARE(value.toStringList(), expectedValue); \
 }
 #define CHECK_FLOATING_POINT_VALUE(property, expectedValueType, expectedValue, isDouble) {\
     QCOMPARE(property.valueType(), expectedValueType); \
     QVariant value = property.variantValue(); \
-    QCOMPARE(value.type(), QVariant::StringList); \
+    QCOMPARE(value.metaType().id(), QMetaType::QStringList); \
     QVERIFY(value.toStringList().size() == 2); \
     QVERIFY(expectedValue.size() == 2); \
     QString actualString = value.toStringList().at(1); \
@@ -822,7 +822,7 @@ void tst_QVersitContactExporter::testEncodeOrganization()
             QStringLiteral("TYPE"), QStringLiteral("JPEG")));
     // Verify value.
     QVariant variantValue = property.variantValue();
-    QVERIFY(variantValue.type() == QVariant::ByteArray);
+    QVERIFY(variantValue.metaType().id() == QMetaType::QByteArray);
     QCOMPARE(variantValue.value<QByteArray>(), mResourceHandler->mSimulatedData);
 
     // Assistant Name Test.
@@ -882,7 +882,7 @@ void tst_QVersitContactExporter::testEncodeAvatar()
     property = findPropertyByName(document, QStringLiteral("PHOTO"));
     QVERIFY(!property.isEmpty());
     QVariant variantValue = property.variantValue();
-    QVERIFY(variantValue.type() == QVariant::ByteArray);
+    QVERIFY(variantValue.metaType().id() == QMetaType::QByteArray);
     QCOMPARE(variantValue.value<QByteArray>(), mResourceHandler->mSimulatedData);
     QVERIFY(property.parameters().contains(QStringLiteral("TYPE"),
                                            QStringLiteral("JPEG")));
@@ -925,7 +925,7 @@ void tst_QVersitContactExporter::testEncodeEmbeddedContent()
     QVERIFY(photoProperty.parameters().contains(QStringLiteral("TYPE"),
                                                 QStringLiteral("JPEG")));
     variantValue = photoProperty.variantValue();
-    QVERIFY(variantValue.type() == QVariant::ByteArray);
+    QVERIFY(variantValue.metaType().id() == QMetaType::QByteArray);
     QCOMPARE(variantValue.value<QByteArray>(), mResourceHandler->mSimulatedData);
 
     // Without a resource handler
@@ -959,7 +959,7 @@ void tst_QVersitContactExporter::testEncodeRingtone()
         QStringLiteral("TYPE"),
         QStringLiteral("WAV")));
     QVariant variantValue = soundProperty.variantValue();
-    QVERIFY(variantValue.type() == QVariant::ByteArray);
+    QVERIFY(variantValue.metaType().id() == QMetaType::QByteArray);
     QCOMPARE(variantValue.value<QByteArray>(), mResourceHandler->mSimulatedData);
 
     // Test url ringtone
@@ -1390,9 +1390,9 @@ void tst_QVersitContactExporter::testEncodeExtendedDetail()
     QVERIFY(!property.isEmpty());
     QCOMPARE(property.parameters().count(), 0);
     QStringList expectedValue = QStringList() << extendedDetailName << extendedDetailDataInProperty;
-    if (static_cast<QMetaType::Type>(extendedDetailData.type()) == QMetaType::Double) {
+    if (extendedDetailData.metaType().id() == QMetaType::Double) {
         CHECK_FLOATING_POINT_VALUE(property, QVersitProperty::CompoundType, expectedValue, true);
-    } else if (static_cast<QMetaType::Type>(extendedDetailData.type()) == QMetaType::Float) {
+    } else if (extendedDetailData.metaType().id() == QMetaType::Float) {
         CHECK_FLOATING_POINT_VALUE(property, QVersitProperty::CompoundType, expectedValue, false);
     } else {
         CHECK_VALUE(property, QVersitProperty::CompoundType, expectedValue);
diff --git a/tests/auto/versit/qversitcontactimporter/tst_qversitcontactimporter.cpp b/tests/auto/versit/qversitcontactimporter/tst_qversitcontactimporter.cpp
index 834074f25..29659d219 100644
--- a/tests/auto/versit/qversitcontactimporter/tst_qversitcontactimporter.cpp
+++ b/tests/auto/versit/qversitcontactimporter/tst_qversitcontactimporter.cpp
@@ -736,7 +736,7 @@ void tst_QVersitContactImporter::testAnniversary()
     QContact contact = mImporter->contacts().first();
     QContactAnniversary anniversary = contact.detail<QContactAnniversary>();
     QCOMPARE(anniversary.originalDate(), QDate(1981, 5, 20));
-    QCOMPARE(anniversary.value(QContactAnniversary::FieldOriginalDate).type(), QVariant::Date);
+    QCOMPARE(anniversary.value(QContactAnniversary::FieldOriginalDate).metaType().id(), QMetaType::QDate);
 
     // Evolution format
     property.setName(QStringLiteral("X-EVOLUTION-ANNIVERSARY"));
@@ -746,7 +746,7 @@ void tst_QVersitContactImporter::testAnniversary()
     contact = mImporter->contacts().first();
     anniversary = contact.detail<QContactAnniversary>();
     QCOMPARE(anniversary.originalDate(), QDate(1981, 5, 20));
-    QCOMPARE(anniversary.value(QContactAnniversary::FieldOriginalDate).type(), QVariant::Date);
+    QCOMPARE(anniversary.value(QContactAnniversary::FieldOriginalDate).metaType().id(), QMetaType::QDate);
 
     // Date : ISO 8601 in basic format
     property.setName(QStringLiteral("X-ANNIVERSARY"));
@@ -756,7 +756,7 @@ void tst_QVersitContactImporter::testAnniversary()
     contact = mImporter->contacts().first();
     anniversary = contact.detail<QContactAnniversary>();
     QCOMPARE(anniversary.originalDate(), QDate(1981, 5, 20));
-    QCOMPARE(anniversary.value(QContactAnniversary::FieldOriginalDate).type(), QVariant::Date);
+    QCOMPARE(anniversary.value(QContactAnniversary::FieldOriginalDate).metaType().id(), QMetaType::QDate);
 
     // Date time tests
     property.setName(QStringLiteral("X-ANNIVERSARY"));
@@ -767,7 +767,7 @@ void tst_QVersitContactImporter::testAnniversary()
     anniversary = contact.detail<QContactAnniversary>();
     QCOMPARE(anniversary.originalDate(), QDate(1981, 5, 20));
     QCOMPARE(anniversary.originalDateTime(), QDateTime(QDate(1981, 5, 20), QTime(0,1,2), Qt::LocalTime));
-    QCOMPARE(anniversary.value(QContactAnniversary::FieldOriginalDate).type(), QVariant::DateTime);
+    QCOMPARE(anniversary.value(QContactAnniversary::FieldOriginalDate).metaType().id(), QMetaType::QDateTime);
 
     property.setValue(QStringLiteral("19810520T010203Z")); // utc
     document = createDocumentWithProperty(property);
@@ -776,7 +776,7 @@ void tst_QVersitContactImporter::testAnniversary()
     anniversary = contact.detail<QContactAnniversary>();
     QCOMPARE(anniversary.originalDate(), QDate(1981, 5, 20));
     QCOMPARE(anniversary.originalDateTime(), QDateTime(QDate(1981, 5, 20), QTime(1,2,3), Qt::UTC));
-    QCOMPARE(anniversary.value(QContactAnniversary::FieldOriginalDate).type(), QVariant::DateTime);
+    QCOMPARE(anniversary.value(QContactAnniversary::FieldOriginalDate).metaType().id(), QMetaType::QDateTime);
 }
 
 void tst_QVersitContactImporter::testBirthday()
@@ -791,7 +791,7 @@ void tst_QVersitContactImporter::testBirthday()
     QContact contact = mImporter->contacts().first();
     QContactBirthday bday = contact.detail<QContactBirthday>();
     QCOMPARE(bday.date().toString(Qt::ISODate), dateValue);
-    QCOMPARE(bday.value(QContactBirthday::FieldBirthday).type(), QVariant::Date);
+    QCOMPARE(bday.value(QContactBirthday::FieldBirthday).metaType().id(), QMetaType::QDate);
 
     // Date : ISO 8601 in basic format
     dateValue = QStringLiteral("19810520");
@@ -801,7 +801,7 @@ void tst_QVersitContactImporter::testBirthday()
     contact = mImporter->contacts().first();
     bday = contact.detail<QContactBirthday>();
     QCOMPARE(bday.date(), QDate(1981, 5, 20));
-    QCOMPARE(bday.value(QContactBirthday::FieldBirthday).type(), QVariant::Date);
+    QCOMPARE(bday.value(QContactBirthday::FieldBirthday).metaType().id(), QMetaType::QDate);
 
     dateValue = QStringLiteral("1981-05-20");
     property.setValue(dateValue);
@@ -810,7 +810,7 @@ void tst_QVersitContactImporter::testBirthday()
     contact = mImporter->contacts().first();
     bday = contact.detail<QContactBirthday>();
     QCOMPARE(bday.date(), QDate(1981, 5, 20));
-    QCOMPARE(bday.value(QContactBirthday::FieldBirthday).type(), QVariant::Date);
+    QCOMPARE(bday.value(QContactBirthday::FieldBirthday).metaType().id(), QMetaType::QDate);
 
     dateValue = QStringLiteral("19810520T100000");
     property.setValue(dateValue);
@@ -819,7 +819,7 @@ void tst_QVersitContactImporter::testBirthday()
     contact = mImporter->contacts().first();
     bday = contact.detail<QContactBirthday>();
     QCOMPARE(bday.dateTime(), QDateTime(QDate(1981, 5, 20), QTime(10, 0, 0), Qt::LocalTime));
-    QCOMPARE(bday.value(QContactBirthday::FieldBirthday).type(), QVariant::DateTime);
+    QCOMPARE(bday.value(QContactBirthday::FieldBirthday).metaType().id(), QMetaType::QDateTime);
 
     dateValue = QStringLiteral("1981-05-20T10:00:00");
     property.setValue(dateValue);
@@ -828,7 +828,7 @@ void tst_QVersitContactImporter::testBirthday()
     contact = mImporter->contacts().first();
     bday = contact.detail<QContactBirthday>();
     QCOMPARE(bday.dateTime(), QDateTime(QDate(1981, 5, 20), QTime(10, 0, 0), Qt::LocalTime));
-    QCOMPARE(bday.value(QContactBirthday::FieldBirthday).type(), QVariant::DateTime);
+    QCOMPARE(bday.value(QContactBirthday::FieldBirthday).metaType().id(), QMetaType::QDateTime);
 
     dateValue = QStringLiteral("19810520T100000Z");
     property.setValue(dateValue);
@@ -837,7 +837,7 @@ void tst_QVersitContactImporter::testBirthday()
     contact = mImporter->contacts().first();
     bday = contact.detail<QContactBirthday>();
     QCOMPARE(bday.dateTime(), QDateTime(QDate(1981, 5, 20), QTime(10, 0, 0), Qt::UTC));
-    QCOMPARE(bday.value(QContactBirthday::FieldBirthday).type(), QVariant::DateTime);
+    QCOMPARE(bday.value(QContactBirthday::FieldBirthday).metaType().id(), QMetaType::QDateTime);
 
     dateValue = QStringLiteral("1981-05-20T10:00:00Z");
     property.setValue(dateValue);
@@ -846,7 +846,7 @@ void tst_QVersitContactImporter::testBirthday()
     contact = mImporter->contacts().first();
     bday = contact.detail<QContactBirthday>();
     QCOMPARE(bday.dateTime(), QDateTime(QDate(1981, 5, 20), QTime(10, 0, 0), Qt::UTC));
-    QCOMPARE(bday.value(QContactBirthday::FieldBirthday).type(), QVariant::DateTime);
+    QCOMPARE(bday.value(QContactBirthday::FieldBirthday).metaType().id(), QMetaType::QDateTime);
 }
 
 void tst_QVersitContactImporter::testGender()
@@ -1494,7 +1494,7 @@ void tst_QVersitContactImporter::testExtendedDetail()
     QContactExtendedDetail extendedDetail = (QContactExtendedDetail)contact.detail(QContactExtendedDetail::Type);
     QCOMPARE(extendedDetail.name(), extendedDetailName);
     QCOMPARE(extendedDetail.data(), extendedDetailData);
-    QCOMPARE(extendedDetail.data().type(), extendedDetailData.type());
+    QCOMPARE(extendedDetail.data().metaType(), extendedDetailData.metaType());
 }
 
 void tst_QVersitContactImporter::testExtendedDetail_data()
@@ -1617,7 +1617,7 @@ void tst_QVersitContactImporter::testExtendedDetail_data()
         QTest::newRow("null denoting an empty variant")
                 << QString("name")
 #if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)
-                << QVariant(static_cast<QVariant::Type>(QMetaType::Nullptr))
+                << QVariant::fromValue<std::nullptr_t>(nullptr)
 #else
                 << QVariant()
 #endif