diff options
| -rw-r--r-- | src/qmldom/qqmldomitem.cpp | 7 | ||||
| -rw-r--r-- | src/qmldom/qqmldompath.cpp | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/qmldom/qqmldomitem.cpp b/src/qmldom/qqmldomitem.cpp index c2acbaebf2..296083c99b 100644 --- a/src/qmldom/qqmldomitem.cpp +++ b/src/qmldom/qqmldomitem.cpp @@ -614,7 +614,7 @@ bool DomItem::resolve(Path path, root = root.environment()[u"universe"]; break; case PathRoot::Other: - myResolveErrors().error(tr("Root context %1 is not knwon").arg(path.headName())).handle(errorHandler); + myResolveErrors().error(tr("Root context %1 is not known").arg(path.headName())).handle(errorHandler); return false; } toDos[0] = {root, 1}; @@ -660,7 +660,8 @@ bool DomItem::resolve(Path path, } if (visitedRefs->contains(toResolve)) { myResolveErrors().error([visitedRefs, toResolve](Sink sink) { - sink(tr("Circular reference:\n")); + sink(tr("Circular reference:")); + sink(u"\n"); for (const Path &vPath : *visitedRefs) { sink(u" "); vPath.dump(sink); @@ -755,7 +756,7 @@ bool DomItem::resolve(Path path, current = PathCurrent::LookupDynamic; } if (current == PathCurrent::LookupStrict) { - myResolveErrors().error(tr("@lookupStrinct unimplemented")) + myResolveErrors().error(tr("@lookupStrict unimplemented")) .handle(errorHandler); return false; } else if (current == PathCurrent::LookupDynamic) { diff --git a/src/qmldom/qqmldompath.cpp b/src/qmldom/qqmldompath.cpp index 871fb20f5c..60086ced10 100644 --- a/src/qmldom/qqmldompath.cpp +++ b/src/qmldom/qqmldompath.cpp @@ -365,7 +365,7 @@ Path Path::fromString(QStringView s, ErrorHandler errorHandler) components.append(Component(Current(s.mid(i0,i-i0)))); state = ParserState::End; } else if (c.isLetter()) { - myErrors().warning(tr("Field expressions should start with dot even a the start of the path %1.") + myErrors().warning(tr("Field expressions should start with a dot, even when at the start of the path %1.") .arg(s)).handle(errorHandler); return Path(); } else { @@ -455,7 +455,7 @@ Path Path::fromString(QStringView s, ErrorHandler errorHandler) myErrors().error(tr("Filter from string not yet implemented.")).handle(errorHandler); return Path(); } else { - myErrors().error(tr("Unexpected character '%1' after square braket at %2.") + myErrors().error(tr("Unexpected character '%1' after square bracket at %2.") .arg(c).arg(i-1)).handle(errorHandler); return Path(); } @@ -495,7 +495,7 @@ Path Path::fromString(QStringView s, ErrorHandler errorHandler) .arg(QString::number(i0))).handle(errorHandler); return Path(); } else { - myErrors().hint(tr("Index shound use square brackets and not a dot (at char %1).") + myErrors().hint(tr("Index should use square brackets and not a dot (at char %1).") .arg(QString::number(i0))).handle(errorHandler); } state = ParserState::End; |