diff options
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/kernel/qguivariant.cpp | 38 |
1 files changed, 28 insertions, 10 deletions
diff --git a/src/gui/kernel/qguivariant.cpp b/src/gui/kernel/qguivariant.cpp index 982fc3ccd5..72f7e183e1 100644 --- a/src/gui/kernel/qguivariant.cpp +++ b/src/gui/kernel/qguivariant.cpp @@ -643,6 +643,9 @@ struct QMetaTypeGuiHelper QMetaType::SaveOperator saveOp; QMetaType::LoadOperator loadOp; #endif + QMetaType::Constructor constructor; + QMetaType::Destructor destructor; + int size; }; extern Q_CORE_EXPORT const QMetaTypeGuiHelper *qMetaTypeGuiHelper; @@ -653,13 +656,21 @@ extern Q_CORE_EXPORT const QMetaTypeGuiHelper *qMetaTypeGuiHelper; typedef void *(*QCreate##TYPE)(const TYPE *); \ static const QCreate##TYPE qCreate##TYPE = qMetaTypeCreateHelper<TYPE>; \ typedef void (*QDelete##TYPE)(TYPE *); \ - static const QDelete##TYPE qDelete##TYPE = qMetaTypeDeleteHelper<TYPE>; + static const QDelete##TYPE qDelete##TYPE = qMetaTypeDeleteHelper<TYPE>; \ + typedef void *(*QConstruct##TYPE)(void *, const TYPE *); \ + static const QConstruct##TYPE qConstruct##TYPE = qMetaTypeConstructHelper<TYPE>; \ + typedef void (*QDestruct##TYPE)(TYPE *); \ + static const QDestruct##TYPE qDestruct##TYPE = qMetaTypeDestructHelper<TYPE>; #else # define Q_DECL_METATYPE_HELPER(TYPE) \ typedef void *(*QCreate##TYPE)(const TYPE *); \ static const QCreate##TYPE qCreate##TYPE = qMetaTypeCreateHelper<TYPE>; \ typedef void (*QDelete##TYPE)(TYPE *); \ static const QDelete##TYPE qDelete##TYPE = qMetaTypeDeleteHelper<TYPE>; \ + typedef void *(*QConstruct##TYPE)(void *, const TYPE *); \ + static const QConstruct##TYPE qConstruct##TYPE = qMetaTypeConstructHelper<TYPE>; \ + typedef void (*QDestruct##TYPE)(TYPE *); \ + static const QDestruct##TYPE qDestruct##TYPE = qMetaTypeDestructHelper<TYPE>; \ typedef void (*QSave##TYPE)(QDataStream &, const TYPE *); \ static const QSave##TYPE qSave##TYPE = qMetaTypeSaveHelper<TYPE>; \ typedef void (*QLoad##TYPE)(QDataStream &, TYPE *); \ @@ -705,13 +716,20 @@ Q_DECL_METATYPE_HELPER(QQuaternion) #ifdef QT_NO_DATASTREAM # define Q_IMPL_METATYPE_HELPER(TYPE) \ { reinterpret_cast<QMetaType::Creator>(qCreate##TYPE), \ - reinterpret_cast<QMetaType::Deleter>(qDelete##TYPE) } + reinterpret_cast<QMetaType::Deleter>(qDelete##TYPE), \ + reinterpret_cast<QMetaType::Constructor>(qConstruct##TYPE), \ + reinterpret_cast<QMetaType::Destructor>(qDestruct##TYPE), \ + sizeof(TYPE) \ + } #else # define Q_IMPL_METATYPE_HELPER(TYPE) \ { reinterpret_cast<QMetaType::Creator>(qCreate##TYPE), \ reinterpret_cast<QMetaType::Deleter>(qDelete##TYPE), \ reinterpret_cast<QMetaType::SaveOperator>(qSave##TYPE), \ - reinterpret_cast<QMetaType::LoadOperator>(qLoad##TYPE) \ + reinterpret_cast<QMetaType::LoadOperator>(qLoad##TYPE), \ + reinterpret_cast<QMetaType::Constructor>(qConstruct##TYPE), \ + reinterpret_cast<QMetaType::Destructor>(qDestruct##TYPE), \ + sizeof(TYPE) \ } #endif @@ -726,12 +744,12 @@ static const QMetaTypeGuiHelper qVariantGuiHelper[] = { Q_IMPL_METATYPE_HELPER(QRegion), Q_IMPL_METATYPE_HELPER(QBitmap), #ifdef QT_NO_CURSOR - {0, 0, 0, 0}, + {0, 0, 0, 0, 0, 0, 0}, #else Q_IMPL_METATYPE_HELPER(QCursor), #endif #ifdef QT_NO_SHORTCUT - {0, 0, 0, 0}, + {0, 0, 0, 0, 0, 0, 0}, #else Q_IMPL_METATYPE_HELPER(QKeySequence), #endif @@ -743,27 +761,27 @@ static const QMetaTypeGuiHelper qVariantGuiHelper[] = { #ifndef QT_NO_MATRIX4X4 Q_IMPL_METATYPE_HELPER(QMatrix4x4), #else - {0, 0, 0, 0}, + {0, 0, 0, 0, 0, 0, 0}, #endif #ifndef QT_NO_VECTOR2D Q_IMPL_METATYPE_HELPER(QVector2D), #else - {0, 0, 0, 0}, + {0, 0, 0, 0, 0, 0, 0}, #endif #ifndef QT_NO_VECTOR3D Q_IMPL_METATYPE_HELPER(QVector3D), #else - {0, 0, 0, 0}, + {0, 0, 0, 0, 0, 0, 0}, #endif #ifndef QT_NO_VECTOR4D Q_IMPL_METATYPE_HELPER(QVector4D), #else - {0, 0, 0, 0}, + {0, 0, 0, 0, 0, 0, 0}, #endif #ifndef QT_NO_QUATERNION Q_IMPL_METATYPE_HELPER(QQuaternion) #else - {0, 0, 0, 0} + {0, 0, 0, 0, 0, 0, 0} #endif }; |