1 files changed, 10 insertions, 13 deletions
diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h
index b68dbacbd3..9e2a5bf75d 100644
--- a/src/corelib/kernel/qmetatype.h
+++ b/src/corelib/kernel/qmetatype.h
@@ -86,6 +86,7 @@ inline Q_DECL_CONSTEXPR int qMetaTypeId();
     F(UChar, 37, uchar) \
     F(Float, 38, float) \
     F(SChar, 40, signed char) \
+    F(Nullptr, 51, std::nullptr_t) \
 
 #define QT_FOR_EACH_STATIC_PRIMITIVE_POINTER(F)\
     F(VoidStar, 31, void*) \
@@ -414,7 +415,7 @@ public:
         QT_FOR_EACH_STATIC_TYPE(QT_DEFINE_METATYPE_ID)
 
         FirstCoreType = Bool,
-        LastCoreType = QPersistentModelIndex,
+        LastCoreType = Nullptr,
         FirstGuiType = QFont,
         LastGuiType = QPolygonF,
         FirstWidgetsType = QSizePolicy,
@@ -506,11 +507,8 @@ public:
     static int registerTypedef(const char *typeName, int aliasId);
     static int registerNormalizedTypedef(const QT_PREPEND_NAMESPACE(QByteArray) &normalizedTypeName, int aliasId);
     static int type(const char *typeName);
-#ifndef Q_QDOC
+
     static int type(const QT_PREPEND_NAMESPACE(QByteArray) &typeName);
-#else
-    static int type(const QByteArray &typeName);
-#endif
     static const char *typeName(int type);
     static int sizeOf(int type);
     static TypeFlags typeFlags(int type);
@@ -600,8 +598,11 @@ public:
     }
 
 #ifdef Q_QDOC
+    template<typename MemberFunction, int>
     static bool registerConverter(MemberFunction function);
+    template<typename MemberFunctionOk, char>
     static bool registerConverter(MemberFunctionOk function);
+    template<typename UnaryFunction>
     static bool registerConverter(UnaryFunction function);
 #else
     // member function as in "QString QFont::toString() const"
@@ -1621,16 +1622,9 @@ namespace QtPrivate {
         { return -1; }
     };
 
-#ifndef Q_COMPILER_VARIADIC_TEMPLATES
     // Function pointers don't derive from QObject
-    template <class Result> struct IsPointerToTypeDerivedFromQObject<Result(*)()> { enum { Value = false }; };
-    template <class Result, class Arg0> struct IsPointerToTypeDerivedFromQObject<Result(*)(Arg0)> { enum { Value = false }; };
-    template <class Result, class Arg0, class Arg1> struct IsPointerToTypeDerivedFromQObject<Result(*)(Arg0, Arg1)> { enum { Value = false }; };
-    template <class Result, class Arg0, class Arg1, class Arg2> struct IsPointerToTypeDerivedFromQObject<Result(*)(Arg0, Arg1, Arg2)> { enum { Value = false }; };
-#else
     template <typename Result, typename... Args>
     struct IsPointerToTypeDerivedFromQObject<Result(*)(Args...)> { enum { Value = false }; };
-#endif
 
     template<typename T>
     struct QMetaTypeTypeFlags
@@ -1857,6 +1851,7 @@ inline int qRegisterMetaTypeStreamOperators()
     } QT_END_NAMESPACE                                                  \
     /**/
 
+#ifndef Q_MOC_RUN
 #define Q_DECLARE_METATYPE(TYPE) Q_DECLARE_METATYPE_IMPL(TYPE)
 #define Q_DECLARE_METATYPE_IMPL(TYPE)                                   \
     QT_BEGIN_NAMESPACE                                                  \
@@ -1876,7 +1871,7 @@ inline int qRegisterMetaTypeStreamOperators()
             }                                                           \
     };                                                                  \
     QT_END_NAMESPACE
-
+#endif // Q_MOC_RUN
 
 #define Q_DECLARE_BUILTIN_METATYPE(TYPE, METATYPEID, NAME) \
     QT_BEGIN_NAMESPACE \
@@ -1899,7 +1894,9 @@ QT_FOR_EACH_STATIC_WIDGETS_CLASS(QT_FORWARD_DECLARE_STATIC_TYPES_ITER)
 typedef QList<QVariant> QVariantList;
 typedef QMap<QString, QVariant> QVariantMap;
 typedef QHash<QString, QVariant> QVariantHash;
+#ifndef Q_QDOC
 typedef QList<QByteArray> QByteArrayList;
+#endif
 
 #define Q_DECLARE_METATYPE_TEMPLATE_1ARG(SINGLE_ARG_TEMPLATE) \
 QT_BEGIN_NAMESPACE \