diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2023-08-29 11:28:40 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2023-08-30 14:18:17 +0200 |
| commit | e86a91dfd5535ce548618270343a2521fb0ef4c6 (patch) | |
| tree | bf9cdd47eb0037b9c7a852f22987bc356387c4d7 /src/qml/qml/qqml.cpp | |
| parent | 4cdf0643b442a57b0cf0dcef104e71c0196dba06 (diff) | |
QtQml: Store singleton typename as UTF-8 QByteArray
We rarely want to read it as QString, and we almost always set it from
UTF-8 data.
Change-Id: I389e9a6de140d8adc09ccc3350685b2d47e03eb8
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/qml/qml/qqml.cpp')
| -rw-r--r-- | src/qml/qml/qqml.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/qml/qqml.cpp b/src/qml/qml/qqml.cpp index 3b855e10e7..d96a4d7d97 100644 --- a/src/qml/qml/qqml.cpp +++ b/src/qml/qml/qqml.cpp @@ -483,7 +483,7 @@ static QQmlType::SingletonInstanceInfo::ConstPtr singletonInstanceInfo( QQmlType::SingletonInstanceInfo::Ptr siinfo = QQmlType::SingletonInstanceInfo::create(); siinfo->scriptCallback = type.scriptApi; siinfo->qobjectCallback = type.qObjectApi; - siinfo->typeName = QString::fromUtf8(type.typeName); + siinfo->typeName = type.typeName; return QQmlType::SingletonInstanceInfo::ConstPtr( siinfo.take(), QQmlType::SingletonInstanceInfo::ConstPtr::Adopt); } @@ -493,7 +493,7 @@ static QQmlType::SingletonInstanceInfo::ConstPtr singletonInstanceInfo( { QQmlType::SingletonInstanceInfo::Ptr siinfo = QQmlType::SingletonInstanceInfo::create(); siinfo->url = QQmlTypeLoader::normalize(type.url); - siinfo->typeName = QString::fromUtf8(type.typeName); + siinfo->typeName = type.typeName; return QQmlType::SingletonInstanceInfo::ConstPtr( siinfo.take(), QQmlType::SingletonInstanceInfo::ConstPtr::Adopt); } |