diff options
| author | Sona Kurazyan <sona.kurazyan@qt.io> | 2022-04-13 14:30:28 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@qt.io> | 2022-05-02 23:38:45 +0000 |
| commit | a0539ed53f45619df7e4aad664369301dd6da091 (patch) | |
| tree | 3529ce5147346c7686bc9c901894b88b06a5dcc2 /src/tools/windeployqt/qmlutils.cpp | |
| parent | 8d6eae7ffd1da8322dff7ca87c092232d9a5f7b4 (diff) | |
Tools: stop using QLatin1Char constructor for creating char literals
Required for porting away from QLatin1Char/QLatin1String in scope of
QTBUG-98434.
As a drive-by, fix qsizetype -> int narrowing conversion warnings for
the touched lines.
Change-Id: Ib9e01ede4e0d7869fc95414d36f37df4a30b16b4
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
Diffstat (limited to 'src/tools/windeployqt/qmlutils.cpp')
| -rw-r--r-- | src/tools/windeployqt/qmlutils.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/tools/windeployqt/qmlutils.cpp b/src/tools/windeployqt/qmlutils.cpp index 6eebf6d86e7..f51462b2df4 100644 --- a/src/tools/windeployqt/qmlutils.cpp +++ b/src/tools/windeployqt/qmlutils.cpp @@ -48,9 +48,9 @@ bool operator==(const QmlImportScanResult::Module &m1, const QmlImportScanResult QString QmlImportScanResult::Module::installPath(const QString &root) const { QString result = root; - const int lastSlashPos = relativePath.lastIndexOf(QLatin1Char('/')); + const qsizetype lastSlashPos = relativePath.lastIndexOf(u'/'); if (lastSlashPos != -1) { - result += QLatin1Char('/'); + result += u'/'; result += QStringView{relativePath}.left(lastSlashPos); } return result; @@ -121,7 +121,7 @@ QmlImportScanResult runQmlImportScanner(const QString &directory, const QStringL if (data.isNull() ) { *errorMessage = binary + QStringLiteral(" returned invalid JSON output: ") + jsonParseError.errorString() + QStringLiteral(" :\"") - + QString::fromLocal8Bit(stdOut) + QLatin1Char('"'); + + QString::fromLocal8Bit(stdOut) + u'"'; return result; } const QJsonArray array = data.array(); |