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/plugins | |
| 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/plugins')
| -rw-r--r-- | src/plugins/qmltooling/qmldbg_debugger/qqmlenginedebugservice.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/plugins/qmltooling/qmldbg_debugger/qqmlenginedebugservice.cpp b/src/plugins/qmltooling/qmldbg_debugger/qqmlenginedebugservice.cpp index 5dcfbf2e0f..971404c831 100644 --- a/src/plugins/qmltooling/qmldbg_debugger/qqmlenginedebugservice.cpp +++ b/src/plugins/qmltooling/qmldbg_debugger/qqmlenginedebugservice.cpp @@ -215,7 +215,8 @@ QVariant QQmlEngineDebugServiceImpl::valueContents(QVariant value) const // maps for serialization. if (value.userType() == qMetaTypeId<QJSValue>()) value = value.value<QJSValue>().toVariant(); - const int userType = value.userType(); + const QMetaType metaType = value.metaType(); + const int metaTypeId = metaType.id(); //QObject * is not streamable. //Convert all such instances to a String value @@ -238,7 +239,7 @@ QVariant QQmlEngineDebugServiceImpl::valueContents(QVariant value) const return contents; } - switch (userType) { + switch (metaTypeId) { case QMetaType::QRect: case QMetaType::QRectF: case QMetaType::QPoint: @@ -257,8 +258,8 @@ QVariant QQmlEngineDebugServiceImpl::valueContents(QVariant value) const case QMetaType::QJsonDocument: return value.toJsonDocument().toVariant(); default: - if (QQmlValueTypeFactory::isValueType(userType)) { - const QMetaObject *mo = QQmlValueTypeFactory::metaObjectForMetaType(userType); + if (QQmlValueTypeFactory::isValueType(metaType)) { + const QMetaObject *mo = QQmlValueTypeFactory::metaObjectForMetaType(metaType); if (mo) { int toStringIndex = mo->indexOfMethod("toString()"); if (toStringIndex != -1) { @@ -274,7 +275,7 @@ QVariant QQmlEngineDebugServiceImpl::valueContents(QVariant value) const return value; } - if (QQmlMetaType::isQObject(userType)) { + if (QQmlMetaType::isQObject(metaTypeId)) { QObject *o = QQmlMetaType::toQObject(value); if (o) { QString name = o->objectName(); |