diff options
| author | Jędrzej Nowacki <jedrzej.nowacki@digia.com> | 2014-10-21 17:08:57 +0200 |
|---|---|---|
| committer | Jędrzej Nowacki <jedrzej.nowacki@digia.com> | 2014-10-24 16:27:42 +0200 |
| commit | 8c4deff51c8064f5a15cae0342bfa66b6663662b (patch) | |
| tree | af53315891fcb8fec0397e03450c2e9c1802ed3a /src/corelib/kernel/qmetatype.h | |
| parent | 9c92a18b975173383454c13d34f4438636f0450c (diff) | |
Fix QVariant associative container conversion from built-in types.
Task-number: QTBUG-41403
Change-Id: I9dab0f9450cac11678eb6d20abd2dd08e86e0900
Reviewed-by: Stephen Kelly <steveire@gmail.com>
Diffstat (limited to 'src/corelib/kernel/qmetatype.h')
| -rw-r--r-- | src/corelib/kernel/qmetatype.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h index 3d859021b5..af38589903 100644 --- a/src/corelib/kernel/qmetatype.h +++ b/src/corelib/kernel/qmetatype.h @@ -2109,6 +2109,21 @@ namespace QtPrivate { }; } +namespace QtMetaTypePrivate { +inline Q_DECL_CONSTEXPR bool isBuiltinSequentialType(int typeId) +{ + return typeId == qMetaTypeId<QStringList>() + || typeId == qMetaTypeId<QByteArrayList>() + || typeId == qMetaTypeId<QVariantList>(); +} + +inline Q_DECL_CONSTEXPR bool isBuiltinAssociativeType(int typeId) +{ + return typeId == qMetaTypeId<QVariantHash>() + || typeId == qMetaTypeId<QVariantMap>(); +} +} // QtMetaTypePrivate + QT_END_NAMESPACE #endif // QMETATYPE_H |