aboutsummaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qdeclarativecomponent.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/declarative/qml/qdeclarativecomponent.cpp')
-rw-r--r--src/declarative/qml/qdeclarativecomponent.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/declarative/qml/qdeclarativecomponent.cpp b/src/declarative/qml/qdeclarativecomponent.cpp
index 0d390b093a..2f1ad82138 100644
--- a/src/declarative/qml/qdeclarativecomponent.cpp
+++ b/src/declarative/qml/qdeclarativecomponent.cpp
@@ -91,16 +91,16 @@ static inline QString buildTypeNameForDebug(const QMetaObject *metaObject)
static const QChar underscore(QLatin1Char('_'));
static const QChar asterisk(QLatin1Char('*'));
QDeclarativeType *type = QDeclarativeMetaType::qmlType(metaObject);
- QString typeName = type ? QLatin1String(type->qmlTypeName()) : QLatin1String(metaObject->className());
+ QString typeName = type ? type->qmlTypeName() : QString::fromUtf8(metaObject->className());
if (!type) {
//### optimize further?
int marker = typeName.indexOf(qmlMarker);
if (marker != -1 && marker < typeName.count() - 1) {
if (typeName[marker + 1] == underscore) {
const QString className = typeName.left(marker) + asterisk;
- type = QDeclarativeMetaType::qmlType(QMetaType::type(className.toLatin1()));
+ type = QDeclarativeMetaType::qmlType(QMetaType::type(className.toUtf8()));
if (type)
- typeName = QLatin1String(type->qmlTypeName());
+ typeName = type->qmlTypeName();
}
}
}