Change-Id: I4923efb537c1d1b5778bf97955dbf247eaa6220a
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Simon Hausmann 2020-02-26 14:10:03 +01:00
parent 4109d6e166
commit 01bacdf7ab

View File

@ -2750,7 +2750,7 @@ QT_WARNING_POP
#endif #endif
template<typename T> template<typename T>
constexpr QMetaTypeInterface *qMetaTypeIntefaceForType() constexpr QMetaTypeInterface *qMetaTypeInterfaceForType()
{ {
using Ty = std::remove_cv_t<std::remove_reference_t<T>>; using Ty = std::remove_cv_t<std::remove_reference_t<T>>;
if constexpr (std::is_same_v<Ty, void>) { if constexpr (std::is_same_v<Ty, void>) {
@ -2765,12 +2765,12 @@ constexpr QMetaTypeInterface *qMetaTypeIntefaceForType()
template<typename T> template<typename T>
QMetaType QMetaType::fromType() QMetaType QMetaType::fromType()
{ {
return QMetaType(QtPrivate::qMetaTypeIntefaceForType<T>()); return QMetaType(QtPrivate::qMetaTypeInterfaceForType<T>());
} }
template<typename... T> template<typename... T>
QtPrivate::QMetaTypeInterface *const qt_metaTypeArray[] = { QtPrivate::QMetaTypeInterface *const qt_metaTypeArray[] = {
QtPrivate::qMetaTypeIntefaceForType<T>()... QtPrivate::qMetaTypeInterfaceForType<T>()...
}; };
QT_END_NAMESPACE QT_END_NAMESPACE