diff options
Diffstat (limited to 'src/tools')
-rw-r--r-- | src/tools/androiddeployqt/main.cpp | 8 | ||||
-rw-r--r-- | src/tools/androidtestrunner/main.cpp | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/tools/androiddeployqt/main.cpp b/src/tools/androiddeployqt/main.cpp index 7b4ccc3114..8473ddcacc 100644 --- a/src/tools/androiddeployqt/main.cpp +++ b/src/tools/androiddeployqt/main.cpp @@ -2248,7 +2248,7 @@ bool createRcc(const Options &options) if (!res) return false; - QLatin1String noZstd; + QLatin1StringView noZstd; if (!options.isZstdCompressionEnabled) noZstd = "--no-zstd"_L1; @@ -2982,7 +2982,7 @@ bool jarSignerSignPackage(const Options &options) } zipAlignTool = "%1%2 -f 4 %3 %4"_L1.arg(shellQuote(zipAlignTool), - options.verbose ? " -v"_L1 : QLatin1String(), + options.verbose ? " -v"_L1 : QLatin1StringView(), shellQuote(packagePath(options, UnsignedAPK)), shellQuote(packagePath(options, SignedAPK))); @@ -3052,7 +3052,7 @@ bool signPackage(const Options &options) const QString verifyZipAlignCommandLine = "%1%2 -c 4 %3"_L1 .arg(shellQuote(zipAlignTool), - options.verbose ? " -v"_L1 : QLatin1String(), + options.verbose ? " -v"_L1 : QLatin1StringView(), shellQuote(packagePath(options, UnsignedAPK))); if (zipalignRunner(verifyZipAlignCommandLine)) { @@ -3073,7 +3073,7 @@ bool signPackage(const Options &options) const QString zipAlignCommandLine = "%1%2 -f 4 %3 %4"_L1 .arg(shellQuote(zipAlignTool), - options.verbose ? " -v"_L1 : QLatin1String(), + options.verbose ? " -v"_L1 : QLatin1StringView(), shellQuote(packagePath(options, UnsignedAPK)), shellQuote(packagePath(options, SignedAPK))); diff --git a/src/tools/androidtestrunner/main.cpp b/src/tools/androidtestrunner/main.cpp index b4486d4d26..08558e0353 100644 --- a/src/tools/androidtestrunner/main.cpp +++ b/src/tools/androidtestrunner/main.cpp @@ -78,7 +78,7 @@ static bool checkTxt(const QByteArray &data) { return false; // Look for "********* Finished testing of tst_QTestName *********" static const QRegularExpression testTail("\\*+ +Finished testing of .+ +\\*+"_L1); - return testTail.match(QLatin1String(data)).hasMatch(); + return testTail.match(QLatin1StringView(data)).hasMatch(); } static bool checkCsv(const QByteArray &data) { @@ -130,7 +130,7 @@ static bool checkTap(const QByteArray &data) { return false; static const QRegularExpression testTail("ok [0-9]* - cleanupTestCase\\(\\)"_L1); - return testTail.match(QLatin1String(data)).hasMatch(); + return testTail.match(QLatin1StringView(data)).hasMatch(); } struct Options @@ -453,7 +453,7 @@ static bool isRunning() { return false; } - return output.indexOf(QLatin1String(" " + g_options.package.toUtf8())) > -1; + return output.indexOf(QLatin1StringView(" " + g_options.package.toUtf8())) > -1; } static bool waitToFinish() |