diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h index cfc5f06c90..06a3241062 100644 --- a/src/corelib/kernel/qmetatype.h +++ b/src/corelib/kernel/qmetatype.h @@ -270,7 +270,7 @@ To convertImplicit(const From& from) } template - struct ValueTypeIsMetaType; + struct SequentialValueTypeIsMetaType; template struct AssociativeValueTypeIsMetaType; template @@ -575,7 +575,7 @@ public: static bool hasRegisteredConverterFunction(int fromTypeId, int toTypeId); #ifndef Q_CLANG_QDOC - template friend struct QtPrivate::ValueTypeIsMetaType; + template friend struct QtPrivate::SequentialValueTypeIsMetaType; template friend struct QtPrivate::AssociativeValueTypeIsMetaType; template friend struct QtPrivate::IsMetaTypePair; template friend struct QtPrivate::MetaTypeSmartPointerHelper; @@ -1316,7 +1316,7 @@ namespace QtPrivate }; template::Defined> - struct ValueTypeIsMetaType + struct SequentialValueTypeIsMetaType { static bool registerConverter(int) { @@ -1325,7 +1325,7 @@ namespace QtPrivate }; template - struct SequentialContainerConverterHelper : ValueTypeIsMetaType + struct SequentialContainerConverterHelper : SequentialValueTypeIsMetaType { }; @@ -1909,7 +1909,7 @@ inline bool QtPrivate::IsMetaTypePair::registerConverter(int id) namespace QtPrivate { template - struct ValueTypeIsMetaType + struct SequentialValueTypeIsMetaType { static bool registerConverter(int id) {