diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2021-04-27 16:56:14 +0200 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2021-04-28 13:37:39 +0200 |
| commit | adf46bcc1bca69eca900d7737c58d0fe1f75bd0e (patch) | |
| tree | bd6e9df3fab2e1b95e3c138569f62b264746997f | |
| parent | 2d5e4a893db981445fa73a6af1a02a07d80e0642 (diff) | |
Fix compiler warnings from char*/QString conversion
Change-Id: I904c123f73a6c398d45215a976652a0712ce40fa
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
| -rw-r--r-- | src/qml/jsruntime/qv4qobjectwrapper.cpp | 3 | ||||
| -rw-r--r-- | src/qmldom/qqmldomitem.cpp | 8 |
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)); |