diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h index 9377ddd87e..2261eb0d12 100644 --- a/src/corelib/kernel/qmetatype.h +++ b/src/corelib/kernel/qmetatype.h @@ -45,6 +45,7 @@ #include #include #include +#include #include #ifndef QT_NO_QOBJECT #include @@ -598,9 +599,14 @@ struct QMetaTypeIdQObject static int qt_metatype_id() { static QBasicAtomicInt metatype_id = Q_BASIC_ATOMIC_INITIALIZER(0); - if (!metatype_id.load()) - metatype_id.storeRelease(qRegisterMetaType(QByteArray(T::staticMetaObject.className() + QByteArray("*")).constData(), + if (!metatype_id.load()) { + int len = strlen(T::staticMetaObject.className()); + QVarLengthArray classNameStar; + classNameStar.append(T::staticMetaObject.className(), len); + classNameStar.append("*\0", 2); + metatype_id.storeRelease(qRegisterMetaType(classNameStar.constData(), reinterpret_cast(quintptr(-1)))); + } return metatype_id.loadAcquire(); } };