diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/kernel/qvariant.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/kernel/qvariant.h | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp index cd2004680b..56e428b052 100644 --- a/src/corelib/kernel/qvariant.cpp +++ b/src/corelib/kernel/qvariant.cpp @@ -255,7 +255,7 @@ static void customConstruct(QVariant::Private *d, const void *copy) return; } - if (QVariant::Private::canUseInternalSpace(size, type.alignOf())) { + if (QVariant::Private::canUseInternalSpace(type)) { type.construct(&d->data, copy); d->is_shared = false; } else { diff --git a/src/corelib/kernel/qvariant.h b/src/corelib/kernel/qvariant.h index aa74aaa18f..012b5c52b6 100644 --- a/src/corelib/kernel/qvariant.h +++ b/src/corelib/kernel/qvariant.h @@ -442,9 +442,12 @@ class Q_CORE_EXPORT QVariant { static constexpr size_t MaxInternalSize = 3*sizeof(void *); template<typename T> - static constexpr bool CanUseInternalSpace = (sizeof(T) <= MaxInternalSize && alignof(T) <= alignof(double)); - static constexpr bool canUseInternalSpace(size_t s, size_t align) - { return s <= MaxInternalSize && align <= alignof(double); } + static constexpr bool CanUseInternalSpace = (QTypeInfo<T>::isRelocatable && sizeof(T) <= MaxInternalSize && alignof(T) <= alignof(double)); + static constexpr bool canUseInternalSpace(QMetaType type) + { + return type.flags() & QMetaType::RelocatableType && + size_t(type.sizeOf()) <= MaxInternalSize && size_t(type.alignOf()) <= alignof(double); + } union { |