diff options
| author | Stephen Kelly <stephen.kelly@kdab.com> | 2012-02-08 01:35:19 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-08 22:29:12 +0100 |
| commit | 14577726ee97c8d6dd176e0039ab2da0193c7bb1 (patch) | |
| tree | 694020840aeb11133ac7951ba72f716c9bd450de /src/corelib/kernel | |
| parent | 22e0948bc3698de98831b03da92214d00cf49006 (diff) | |
Build with QT_NO_CAST_FROM_BYTEARRAY
Change-Id: I9069b61c6247bdff323e2e5e93b70e42c3504201
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Reviewed-by: David Faure <faure@kde.org>
Diffstat (limited to 'src/corelib/kernel')
| -rw-r--r-- | src/corelib/kernel/qmetatype.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h index e99c93c372..fd27bb81de 100644 --- a/src/corelib/kernel/qmetatype.h +++ b/src/corelib/kernel/qmetatype.h @@ -530,7 +530,7 @@ struct QMetaTypeId< SINGLE_ARG_TEMPLATE<T> > \ { \ static QBasicAtomicInt metatype_id = Q_BASIC_ATOMIC_INITIALIZER(0); \ if (!metatype_id.load()) \ - metatype_id.storeRelease(qRegisterMetaType< SINGLE_ARG_TEMPLATE<T> >( QByteArray(QByteArray(#SINGLE_ARG_TEMPLATE "<") + QMetaType::typeName(qMetaTypeId<T>()) + ">"), \ + metatype_id.storeRelease(qRegisterMetaType< SINGLE_ARG_TEMPLATE<T> >( QByteArray(QByteArray(#SINGLE_ARG_TEMPLATE "<") + QMetaType::typeName(qMetaTypeId<T>()) + ">").constData(), \ reinterpret_cast< SINGLE_ARG_TEMPLATE<T> *>(quintptr(-1)))); \ return metatype_id.loadAcquire(); \ } \ |