diff options
| -rw-r--r-- | src/qml/jsruntime/qv4propertykey.cpp | 6 | ||||
| -rw-r--r-- | src/qml/qml/qqmlpropertybinding.cpp | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/qml/jsruntime/qv4propertykey.cpp b/src/qml/jsruntime/qv4propertykey.cpp index ac03e01a73..d93ff8e794 100644 --- a/src/qml/jsruntime/qv4propertykey.cpp +++ b/src/qml/jsruntime/qv4propertykey.cpp @@ -8,6 +8,8 @@ #include <qv4engine_p.h> #include <qv4scopedvalue_p.h> +using namespace Qt::Literals::StringLiterals; + QV4::Heap::StringOrSymbol *QV4::PropertyKey::toStringOrSymbol(QV4::ExecutionEngine *e) { if (isArrayIndex()) @@ -56,9 +58,9 @@ QV4::Heap::String *QV4::PropertyKey::asFunctionName(ExecutionEngine *engine, Fun { QString n; if (prefix == Getter) - n = QStringLiteral("get "); + n += "get "_L1; else if (prefix == Setter) - n = QStringLiteral("set "); + n += "set "_L1; if (isArrayIndex()) n += QString::number(asArrayIndex()); else { diff --git a/src/qml/qml/qqmlpropertybinding.cpp b/src/qml/qml/qqmlpropertybinding.cpp index 5f646b62de..c8a7e6256a 100644 --- a/src/qml/qml/qqmlpropertybinding.cpp +++ b/src/qml/qml/qqmlpropertybinding.cpp @@ -16,6 +16,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::Literals::StringLiterals; + Q_LOGGING_CATEGORY(lcQQPropertyBinding, "qt.qml.propertybinding"); QUntypedPropertyBinding QQmlPropertyBinding::create(const QQmlPropertyData *pd, QV4::Function *function, @@ -279,7 +281,7 @@ QString QQmlPropertyBinding::createBindingLoopErrorDescription() Q_ASSERT(propertyData); Q_ASSERT(!targetIndex().hasValueTypeIndex()); QQmlProperty prop = QQmlPropertyPrivate::restore(target(), *propertyData, &valueTypeData, nullptr); - return QStringLiteral(R"(QML %1: Binding loop detected for property "%2")").arg(QQmlMetaType::prettyTypeName(target()) , prop.name()); + return R"(QML %1: Binding loop detected for property "%2")"_L1.arg(QQmlMetaType::prettyTypeName(target()) , prop.name()); } void QQmlPropertyBinding::bindingErrorCallback(QPropertyBindingPrivate *that) |