diff options
| author | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-11-27 13:48:11 +0100 |
|---|---|---|
| committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-12-03 10:38:43 +0100 |
| commit | 77c02343e2c86bd80994882d709fe12f745705ba (patch) | |
| tree | 214ae179c7d62f4328aaf75b6447e08c5a5c7d32 /src/qml/qml/qqmlengine_p.h | |
| parent | 76aa1d578d0eb0e819bac34292f2788853dc5199 (diff) | |
Use QMetaType instead of metatype-id, take 2
This time, the ValueTypeFactory gets converted. As a consequence, many
callers get touched again.
Task-number: QTBUG-88766
Change-Id: I3a8b7d5cfeb7fac85daf1702febba205971d4256
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/qml/qml/qqmlengine_p.h')
| -rw-r--r-- | src/qml/qml/qqmlengine_p.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlengine_p.h b/src/qml/qml/qqmlengine_p.h index 7db03570e2..b217f09ca6 100644 --- a/src/qml/qml/qqmlengine_p.h +++ b/src/qml/qml/qqmlengine_p.h @@ -288,13 +288,14 @@ public: mutable QMutex networkAccessManagerMutex; - QQmlGadgetPtrWrapper *valueTypeInstance(int typeIndex) + QQmlGadgetPtrWrapper *valueTypeInstance(QMetaType type) { + int typeIndex = type.id(); auto it = cachedValueTypeInstances.find(typeIndex); if (it != cachedValueTypeInstances.end()) return *it; - if (QQmlValueType *valueType = QQmlValueTypeFactory::valueType(typeIndex)) { + if (QQmlValueType *valueType = QQmlValueTypeFactory::valueType(type)) { QQmlGadgetPtrWrapper *instance = new QQmlGadgetPtrWrapper(valueType, q_func()); cachedValueTypeInstances.insert(typeIndex, instance); return instance; |