diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-24 01:00:15 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-24 01:00:15 +0100 |
| commit | 73894987a22c9821c508c921f38a0db442559c71 (patch) | |
| tree | 15182a0090157a9b6621e2688ca6b44963962ee6 /src/qml/qml/qqmlvaluetypewrapper.cpp | |
| parent | 8aa13799516bb412908a5612da5ea5ba0972b998 (diff) | |
| parent | 861f53d60cc2dd8bd8529c65863af881dbdd8db8 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I9f0d5adf1ba7d3246b1107a20d145e7aac2c7a77
Diffstat (limited to 'src/qml/qml/qqmlvaluetypewrapper.cpp')
| -rw-r--r-- | src/qml/qml/qqmlvaluetypewrapper.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/qml/qml/qqmlvaluetypewrapper.cpp b/src/qml/qml/qqmlvaluetypewrapper.cpp index d367edad1b..d10fad191c 100644 --- a/src/qml/qml/qqmlvaluetypewrapper.cpp +++ b/src/qml/qml/qqmlvaluetypewrapper.cpp @@ -194,8 +194,8 @@ ReturnedValue QQmlValueTypeWrapper::create(ExecutionEngine *engine, QObject *obj r->d()->setPropertyCache(QJSEnginePrivate::get(engine)->cache(metaObject)); auto valueType = QQmlValueTypeFactory::valueType(typeId); if (!valueType) { - QMetaType metaType(typeId); - return engine->throwTypeError(QLatin1String("Type %1 is not a value type").arg(metaType.name())); + return engine->throwTypeError(QLatin1String("Type %1 is not a value type") + .arg(QString::fromUtf8(QMetaType(typeId).name()))); } r->d()->setValueType(valueType); r->d()->setGadgetPtr(nullptr); @@ -211,8 +211,8 @@ ReturnedValue QQmlValueTypeWrapper::create(ExecutionEngine *engine, const QVaria r->d()->setPropertyCache(QJSEnginePrivate::get(engine)->cache(metaObject)); auto valueType = QQmlValueTypeFactory::valueType(typeId); if (!valueType) { - QMetaType metaType(typeId); - return engine->throwTypeError(QLatin1String("Type %1 is not a value type").arg(metaType.name())); + return engine->throwTypeError(QLatin1String("Type %1 is not a value type") + .arg(QString::fromUtf8(QMetaType(typeId).name()))); } r->d()->setValueType(valueType); r->d()->setGadgetPtr(nullptr); |