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>

1 files changed, 3 insertions, 3 deletions

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())