diff options
| author | Jocelyn Turcotte <jturcotte@woboq.com> | 2015-08-10 21:39:04 +0200 |
|---|---|---|
| committer | Jocelyn Turcotte (Woboq GmbH) <jturcotte@woboq.com> | 2015-08-24 21:03:24 +0000 |
| commit | 1977855f3115ab9ad1642b522840ff3424a5f2fe (patch) | |
| tree | 4cd370bd01c9fe1d5f8889d171f98507e8470a37 /src/corelib/kernel/qmetatype.h | |
| parent | 2f43ac9dcdf4681267538f046a3d1b2c82ae0746 (diff) | |
Avoid recreating QVariantLists when extracted from a QVariant
Wrapping a QVariantList in a QVariant to pass it to QML would
trigger a deep copy each time QML would try to access elements
in the list (specifically in QQmlListAccessor::at).
This reverts a part of 8c4deff51c8064f5a15cae0342bfa66b6663662b
by specifying the associative array conversions explicitly without
including the current type in the list of types to convert through
an iteration.
Task-number: QTBUG-41403
Change-Id: If9fddfe6d36f789ac4aa61a7c32677cd1dd077d8
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Diffstat (limited to 'src/corelib/kernel/qmetatype.h')
| -rw-r--r-- | src/corelib/kernel/qmetatype.h | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h index 9e3e1e94fa..b7f01ca5ca 100644 --- a/src/corelib/kernel/qmetatype.h +++ b/src/corelib/kernel/qmetatype.h @@ -2244,21 +2244,6 @@ 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 |