diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2020-03-23 10:49:45 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-03-23 10:54:47 +0100 |
| commit | af57d450037988bf9ac938473a9df000c7b60506 (patch) | |
| tree | 67793fa7d3238d6c74a20901f63ae50707e7c3c1 /src | |
| parent | ea775373c5905e577e6ff2209c4a0a37437dd569 (diff) | |
QQmlValueTypeWrapper: Avoid compile warnings
The type names are expected to be UTF-8 and we don't need to keep
temporary meta types.
Change-Id: I676d04d8733ef0ea3e159038d4973753350572bf
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src')
| -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 aa7e28add0..110288faf7 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); |