Adapt to latest qtbase MOC and QMetaType changes

Change-Id: I0d6379b7739cd44b5e0668e4ec6b4de52ed7400c
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>

2 files changed, 3 insertions, 3 deletions

diff --git a/src/scxml/qscxmlecmascriptdatamodel.cpp b/src/scxml/qscxmlecmascriptdatamodel.cpp
index 1faf453..2f06d9d 100644
--- a/src/scxml/qscxmlecmascriptdatamodel.cpp
+++ b/src/scxml/qscxmlecmascriptdatamodel.cpp
@@ -192,7 +192,7 @@ public:
             return data;
         }
 
-        if (eventData == QVariant(QMetaType::VoidStar, 0)) {
+        if (eventData == QVariant(QMetaType(QMetaType::VoidStar), nullptr)) {
             return QJSValue(QJSValue::NullValue);
         }
 
diff --git a/src/scxml/qscxmlevent.cpp b/src/scxml/qscxmlevent.cpp
index 2ec7566..7444c65 100644
--- a/src/scxml/qscxmlevent.cpp
+++ b/src/scxml/qscxmlevent.cpp
@@ -71,7 +71,7 @@ QScxmlEvent *QScxmlEventBuilder::buildEvent()
         }
         if (!ok) {
             // expr evaluation failure results in the data property of the event being set to null. See e.g. test528.
-            data = QVariant(QMetaType::VoidStar, 0);
+            data = QVariant(QMetaType(QMetaType::VoidStar), nullptr);
         }
     } else {
         QVariantMap keyValues;
@@ -86,7 +86,7 @@ QScxmlEvent *QScxmlEventBuilder::buildEvent()
         } else {
             // If the evaluation of the <param> tags fails, set _event.data to an empty string.
             // See test343.
-            data = QVariant(QMetaType::VoidStar, 0);
+            data = QVariant(QMetaType(QMetaType::VoidStar), nullptr);
         }
     }