diff options
| author | Olivier Goffart <ogoffart@woboq.com> | 2013-11-04 22:09:20 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-08 16:22:46 +0100 |
| commit | 9fda89f97d666c732a592a5fc1f97a649b295718 (patch) | |
| tree | 899fcacdba90330a708a63de48591e807655989b /src/corelib/kernel/qvariant_p.h | |
| parent | 4fb04b0bd7d93f54ddab13b2e6fd981413baad59 (diff) | |
Make use of the internal space for enum in QVariant
Enums are movable even if they have not been tagged as such, and
therefore can safely make use of the internal storage.
Change-Id: I3bec8556bfeb4a07cb30d918f8d1dd2565d6d94a
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Diffstat (limited to 'src/corelib/kernel/qvariant_p.h')
| -rw-r--r-- | src/corelib/kernel/qvariant_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/kernel/qvariant_p.h b/src/corelib/kernel/qvariant_p.h index 4ec049e20d..b523d19187 100644 --- a/src/corelib/kernel/qvariant_p.h +++ b/src/corelib/kernel/qvariant_p.h @@ -67,7 +67,7 @@ template<typename T> struct QVariantIntegrator { static const bool CanUseInternalSpace = sizeof(T) <= sizeof(QVariant::Private::Data) - && (!QTypeInfo<T>::isStatic); + && ((!QTypeInfo<T>::isStatic) || Q_IS_ENUM(T)); }; Q_STATIC_ASSERT(QVariantIntegrator<double>::CanUseInternalSpace); Q_STATIC_ASSERT(QVariantIntegrator<long int>::CanUseInternalSpace); |