Adapt to qtbase changes

The internal QVariant constructor taking a QMetaTypeId has been removed.
Thus, construct QMetaTypes where necessary from the id, or avoid a
QMetaType -> ID -> QMetaType roundtrip where we already have a metatype.
Also fix a few missing includse that were previously transitively
included.

Change-Id: I56ce92281d616108a4ff80fe5052b919d1282357
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@qt.io>

5 files changed, 9 insertions, 9 deletions

diff --git a/src/qml/qml/qqmlboundsignal.cpp b/src/qml/qml/qqmlboundsignal.cpp
index a818f0e944..b34ab18a72 100644
--- a/src/qml/qml/qqmlboundsignal.cpp
+++ b/src/qml/qml/qqmlboundsignal.cpp
@@ -214,7 +214,7 @@ void QQmlBoundSignalExpression::evaluate(void **a)
             else
                 jsCall->args[ii] = QV4::QObjectWrapper::wrap(v4, *reinterpret_cast<QObject* const *>(a[ii + 1]));
         } else {
-            jsCall->args[ii] = scope.engine->fromVariant(QVariant(type, a[ii + 1]));
+            jsCall->args[ii] = scope.engine->fromVariant(QVariant(QMetaType(type), a[ii + 1]));
         }
     }
 
diff --git a/src/qml/qml/qqmlproperty.cpp b/src/qml/qml/qqmlproperty.cpp
index 5a2c87f221..0de097e81e 100644
--- a/src/qml/qml/qqmlproperty.cpp
+++ b/src/qml/qml/qqmlproperty.cpp
@@ -1088,12 +1088,12 @@ QVariant QQmlPropertyPrivate::readValueProperty()
         if (core.propType() == QMetaType::QVariant) {
             args[0] = &value;
         } else {
-            value = QVariant(core.propType(), (void*)nullptr);
+            value = QVariant(QMetaType(core.propType()), (void*)nullptr);
             args[0] = value.data();
         }
         core.readPropertyWithArgs(object, args);
         if (core.propType() != QMetaType::QVariant && args[0] != value.data())
-            return QVariant((QVariant::Type)core.propType(), args[0]);
+            return QVariant(QMetaType(core.propType()), args[0]);
 
         return value;
     }
@@ -1244,7 +1244,7 @@ bool QQmlPropertyPrivate::write(
             // This reflects the fact that you can assign a nullptr to a QObject pointer
             // Without the change to QObjectStar, rawMetaObjectForType would not give us a QQmlMetaObject
             varType = QMetaType::QObjectStar;
-            val = QVariant(QMetaType::QObjectStar, nullptr);
+            val = QVariant(QMetaType::fromType<QObject *>(), nullptr);
         }
         QQmlMetaObject valMo = rawMetaObjectForType(enginePriv, varType);
         if (valMo.isNull())
diff --git a/src/qml/qml/qqmlvaluetype.cpp b/src/qml/qml/qqmlvaluetype.cpp
index f326e86e64..d385013ff4 100644
--- a/src/qml/qml/qqmlvaluetype.cpp
+++ b/src/qml/qml/qqmlvaluetype.cpp
@@ -265,7 +265,7 @@ void QQmlGadgetPtrWrapper::write(QObject *obj, int idx, QQmlPropertyData::WriteF
 QVariant QQmlGadgetPtrWrapper::value()
 {
     Q_ASSERT(m_gadgetPtr);
-    return QVariant(metaTypeId(), m_gadgetPtr);
+    return QVariant(QMetaType(metaTypeId()), m_gadgetPtr);
 }
 
 void QQmlGadgetPtrWrapper::setValue(const QVariant &value)
diff --git a/src/qml/qml/qqmlvaluetypewrapper.cpp b/src/qml/qml/qqmlvaluetypewrapper.cpp
index cfd9374b8a..272b8ebfc7 100644
--- a/src/qml/qml/qqmlvaluetypewrapper.cpp
+++ b/src/qml/qml/qqmlvaluetypewrapper.cpp
@@ -122,7 +122,7 @@ void Heap::QQmlValueTypeWrapper::setValue(const QVariant &value) const
 QVariant Heap::QQmlValueTypeWrapper::toVariant() const
 {
     Q_ASSERT(gadgetPtr());
-    return QVariant(valueType()->metaType.id(), gadgetPtr());
+    return QVariant(valueType()->metaType, gadgetPtr());
 }
 
 
@@ -460,7 +460,7 @@ Q_ALWAYS_INLINE static ReturnedValue getGadgetProperty(ExecutionEngine *engine,
     if (property->propType() == QMetaType::QVariant) {
         args[0] = &v;
     } else {
-        v = QVariant(property->propType(), static_cast<void *>(nullptr));
+        v = QVariant(QMetaType(property->propType()), static_cast<void *>(nullptr));
         args[0] = v.data();
     }
     metaObject->d.static_metacall(reinterpret_cast<QObject*>(valueTypeWrapper->gadgetPtr()), QMetaObject::ReadProperty,
diff --git a/src/qml/qml/qqmlvmemetaobject.cpp b/src/qml/qml/qqmlvmemetaobject.cpp
index 9af7e539e3..fbfc387cc6 100644
--- a/src/qml/qml/qqmlvmemetaobject.cpp
+++ b/src/qml/qml/qqmlvmemetaobject.cpp
@@ -361,7 +361,7 @@ bool QQmlInterceptorMetaObject::intercept(QMetaObject::Call c, int id, void **a)
                     //
 
                     QMetaProperty valueProp = valueType->property(valueIndex);
-                    QVariant newValue(type, a[0]);
+                    QVariant newValue(QMetaType(type), a[0]);
 
                     valueType->read(object, id);
                     QVariant prevComponentValue = valueProp.read(valueType);
@@ -382,7 +382,7 @@ bool QQmlInterceptorMetaObject::intercept(QMetaObject::Call c, int id, void **a)
                     if (updated)
                         return true;
                 } else {
-                    vi->write(QVariant(type, a[0]));
+                    vi->write(QVariant(QMetaType(type), a[0]));
                     return true;
                 }
             }