1 files changed, 10 insertions, 8 deletions
diff --git a/src/corelib/kernel/qmetatype_p.h b/src/corelib/kernel/qmetatype_p.h
index eba0207ea7..d743d5a5c7 100644
--- a/src/corelib/kernel/qmetatype_p.h
+++ b/src/corelib/kernel/qmetatype_p.h
@@ -140,12 +140,12 @@ public:
     /*saveOp*/(QtMetaTypePrivate::QMetaTypeFunctionHelper<Type, QtMetaTypePrivate::TypeDefinition<Type>::IsAvailable>::Save), \
     /*loadOp*/(QtMetaTypePrivate::QMetaTypeFunctionHelper<Type, QtMetaTypePrivate::TypeDefinition<Type>::IsAvailable>::Load),
 #  define QT_METATYPE_INTERFACE_INIT_EMPTY_DATASTREAM_IMPL(Type) \
-    /*saveOp*/ 0, \
-    /*loadOp*/ 0,
+    /*saveOp*/ nullptr, \
+    /*loadOp*/ nullptr,
 #else
 #  define QT_METATYPE_INTERFACE_INIT_EMPTY_DATASTREAM_IMPL(Type) \
-    /*saveOp*/ 0, \
-    /*loadOp*/ 0,
+    /*saveOp*/ nullptr, \
+    /*loadOp*/ nullptr,
 #  define QT_METATYPE_INTERFACE_INIT_DATASTREAM_IMPL(Type) \
     QT_METATYPE_INTERFACE_INIT_EMPTY_DATASTREAM_IMPL(Type)
 #endif
@@ -153,7 +153,7 @@ public:
 #ifndef QT_BOOTSTRAPPED
 #define METAOBJECT_DELEGATE(Type) (QtPrivate::MetaObjectForType<Type>::value())
 #else
-#define METAOBJECT_DELEGATE(Type) 0
+#define METAOBJECT_DELEGATE(Type) nullptr
 #endif
 
 #define QT_METATYPE_INTERFACE_INIT_IMPL(Type, DATASTREAM_DELEGATE) \
@@ -184,11 +184,11 @@ public:
 #define QT_METATYPE_INTERFACE_INIT_EMPTY() \
 { \
     QT_METATYPE_INTERFACE_INIT_EMPTY_DATASTREAM_IMPL(void) \
-    /*constructor*/ 0, \
-    /*destructor*/ 0, \
+    /*constructor*/ nullptr, \
+    /*destructor*/ nullptr, \
     /*size*/ 0, \
     /*flags*/ 0, \
-    /*metaObject*/ 0 , \
+    /*metaObject*/ nullptr , \
     /*typedConstructor*/ nullptr, \
     /*typedDestructor*/ nullptr \
 }
@@ -206,7 +206,9 @@ template<> struct TypeDefinition<QCborArray> { static const bool IsAvailable = f
 template<> struct TypeDefinition<QCborMap> { static const bool IsAvailable = false; };
 template<> struct TypeDefinition<QCborSimpleType> { static const bool IsAvailable = false; };
 template<> struct TypeDefinition<QCborValue> { static const bool IsAvailable = false; };
+#if QT_CONFIG(easingcurve)
 template<> struct TypeDefinition<QEasingCurve> { static const bool IsAvailable = false; };
+#endif
 template<> struct TypeDefinition<QJsonArray> { static const bool IsAvailable = false; };
 template<> struct TypeDefinition<QJsonDocument> { static const bool IsAvailable = false; };
 template<> struct TypeDefinition<QJsonObject> { static const bool IsAvailable = false; };