diff options
| author | Robert Loehning <[email protected]> | 2019-10-18 16:58:46 +0200 |
|---|---|---|
| committer | Robert Loehning <[email protected]> | 2019-10-21 17:18:55 +0200 |
| commit | 45652a0491aa32ecdf1d05c236501f78bcea71f8 (patch) | |
| tree | 9122f3b7006ee3a87fd45410829c3ab43e12e257 | |
| parent | 00ae3b2323e9b138b0b43f301ec9da9407c66600 (diff) | |
Fix typo
Change-Id: I6bdb4ca295853d4c179198adcc0856d86b182656
Reviewed-by: Leena Miettinen <[email protected]>
| -rw-r--r-- | src/qml/qml/qqmlpropertyvalidator.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/qml/qqmllanguage/data/objectValueTypeProperty.errors.txt | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/qml/qqmlpropertyvalidator.cpp b/src/qml/qml/qqmlpropertyvalidator.cpp index 6959b05105..ef85d6e4d9 100644 --- a/src/qml/qml/qqmlpropertyvalidator.cpp +++ b/src/qml/qml/qqmlpropertyvalidator.cpp @@ -728,12 +728,12 @@ QQmlJS::DiagnosticMessage QQmlPropertyValidator::validateObjectBinding(QQmlPrope return noError; } else if (isPrimitiveType(propType)) { auto typeName = QMetaType::typeName(propType); - return qQmlCompileError(binding->location, tr("Can not assign value of type \"%1\" to property \"%2\", expecting \"%3\"") + return qQmlCompileError(binding->location, tr("Cannot assign value of type \"%1\" to property \"%2\", expecting \"%3\"") .arg(rhsType()) .arg(propertyName) .arg(typeName)); } else if (QQmlValueTypeFactory::isValueType(propType)) { - return qQmlCompileError(binding->location, tr("Can not assign value of type \"%1\" to property \"%2\", expecting an object") + return qQmlCompileError(binding->location, tr("Cannot assign value of type \"%1\" to property \"%2\", expecting an object") .arg(rhsType()).arg(propertyName)); } else if (propType == qMetaTypeId<QQmlScriptString>()) { return qQmlCompileError(binding->valueLocation, tr("Invalid property assignment: script expected")); diff --git a/tests/auto/qml/qqmllanguage/data/objectValueTypeProperty.errors.txt b/tests/auto/qml/qqmllanguage/data/objectValueTypeProperty.errors.txt index 043f714636..887d87b9fb 100644 --- a/tests/auto/qml/qqmllanguage/data/objectValueTypeProperty.errors.txt +++ b/tests/auto/qml/qqmllanguage/data/objectValueTypeProperty.errors.txt @@ -1 +1 @@ -4:18:Can not assign value of type "MyTypeObject" to property "x", expecting "int" +4:18:Cannot assign value of type "MyTypeObject" to property "x", expecting "int" |