aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/qml/jsruntime/qv4qobjectwrapper.cpp3
-rw-r--r--src/qmldom/qqmldomitem.cpp8
2 files changed, 6 insertions, 5 deletions
diff --git a/src/qml/jsruntime/qv4qobjectwrapper.cpp b/src/qml/jsruntime/qv4qobjectwrapper.cpp
index 5df7323a45..62a3c9f025 100644
--- a/src/qml/jsruntime/qv4qobjectwrapper.cpp
+++ b/src/qml/jsruntime/qv4qobjectwrapper.cpp
@@ -523,7 +523,8 @@ void QObjectWrapper::setProperty(ExecutionEngine *engine, QObject *object, QQmlP
targetObject->metaObject()->metacall(targetObject, QMetaObject::BindableProperty, targetIndex.coreIndex(), &argv);
bool ok = bindable.setBinding(binding);
if (!ok) {
- auto error = QStringLiteral("Failed to set binding on %1::%2.").arg(object->metaObject()->className(), property->name(object));
+ auto error = QStringLiteral("Failed to set binding on %1::%2.").
+ arg(QString::fromUtf8(object->metaObject()->className()), property->name(object));
scope.engine->throwError(error);
}
} else {
diff --git a/src/qmldom/qqmldomitem.cpp b/src/qmldom/qqmldomitem.cpp
index 3af677a619..581ffcc5ac 100644
--- a/src/qmldom/qqmldomitem.cpp
+++ b/src/qmldom/qqmldomitem.cpp
@@ -238,10 +238,10 @@ bool domTypeCanBeInline(DomType k)
QCborValue locationToData(SourceLocation loc, QStringView strValue)
{
QCborMap res({
- {"offset", loc.offset},
- {"length", loc.length},
- {"startLine", loc.startLine},
- {"startColumn", loc.startColumn}
+ {QStringLiteral(u"offset"), loc.offset},
+ {QStringLiteral(u"length"), loc.length},
+ {QStringLiteral(u"startLine"), loc.startLine},
+ {QStringLiteral(u"startColumn"), loc.startColumn}
});
if (!strValue.isEmpty())
res.insert(QStringLiteral(u"strValue"), QCborValue(strValue));