diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2015-07-17 21:29:20 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2015-09-24 16:55:10 +0000 |
| commit | 3bcb3c64e278ba27d2d9dbeb8ef1eed5aff6b8ae (patch) | |
| tree | 19f94653adad01a35fb7e368e31791798587ad0b /src | |
| parent | 90ef87578515d7321105981b8c15fa88ae4c926a (diff) | |
Use QTypeInfo<T>::isRelocatable in QVariant
Change-Id: Ib306f8f647014b399b87ffff13f1f01c40dc3ef7
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/kernel/qmetatype.h | 2 | ||||
| -rw-r--r-- | src/corelib/kernel/qvariant_p.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h index b7f01ca5ca..3b8f8e7166 100644 --- a/src/corelib/kernel/qmetatype.h +++ b/src/corelib/kernel/qmetatype.h @@ -1627,7 +1627,7 @@ namespace QtPrivate { template<typename T> struct QMetaTypeTypeFlags { - enum { Flags = (!QTypeInfo<T>::isStatic ? QMetaType::MovableType : 0) + enum { Flags = (QTypeInfoQuery<T>::isRelocatable ? QMetaType::MovableType : 0) | (QTypeInfo<T>::isComplex ? QMetaType::NeedsConstruction : 0) | (QTypeInfo<T>::isComplex ? QMetaType::NeedsDestruction : 0) | (IsPointerToTypeDerivedFromQObject<T>::Value ? QMetaType::PointerToQObject : 0) diff --git a/src/corelib/kernel/qvariant_p.h b/src/corelib/kernel/qvariant_p.h index 3b30b1286d..d84d702982 100644 --- a/src/corelib/kernel/qvariant_p.h +++ b/src/corelib/kernel/qvariant_p.h @@ -58,7 +58,7 @@ template<typename T> struct QVariantIntegrator { static const bool CanUseInternalSpace = sizeof(T) <= sizeof(QVariant::Private::Data) - && ((!QTypeInfo<T>::isStatic) || Q_IS_ENUM(T)); + && ((QTypeInfoQuery<T>::isRelocatable) || Q_IS_ENUM(T)); }; Q_STATIC_ASSERT(QVariantIntegrator<double>::CanUseInternalSpace); Q_STATIC_ASSERT(QVariantIntegrator<long int>::CanUseInternalSpace); |