diff options
| author | Jędrzej Nowacki <jedrzej.nowacki@nokia.com> | 2012-03-13 14:15:53 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-14 09:45:07 +0100 |
| commit | 22494ea8e82d5d5588e67e8067f0273687ed9098 (patch) | |
| tree | f0b7a4f6d498ba8e109677756183ff371f5f9171 /src/corelib/kernel/qmetatype_p.h | |
| parent | e92ceba13d751c151604726c3fa67ff4c918629f (diff) | |
Unify QMetaType::TypeFlags detection.
Duplicated code was removed. As an side effect:
- one runtime flag check was replaced by a compile time check.
- is enum flag can be used together with built-in types.
Change-Id: I54173e7b07ce7e487d3cc21ba24dcccd28b5d049
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'src/corelib/kernel/qmetatype_p.h')
| -rw-r--r-- | src/corelib/kernel/qmetatype_p.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/corelib/kernel/qmetatype_p.h b/src/corelib/kernel/qmetatype_p.h index b50521c7a6..c73f8d0a20 100644 --- a/src/corelib/kernel/qmetatype_p.h +++ b/src/corelib/kernel/qmetatype_p.h @@ -155,9 +155,7 @@ public: /*constructor*/(qMetaTypeConstructHelper<Type>), \ /*destructor*/(qMetaTypeDestructHelper<Type>), \ /*size*/(QTypeInfo<Type>::sizeOf), \ - /*flags*/(!QTypeInfo<Type>::isStatic * QMetaType::MovableType) \ - | (QTypeInfo<Type>::isComplex * QMetaType::NeedsConstruction) \ - | (QTypeInfo<Type>::isComplex * QMetaType::NeedsDestruction) \ + /*flags*/QtPrivate::QMetaTypeTypeFlags<Type>::Flags \ } |