diff options
| -rw-r--r-- | src/plugins/android/androidbuildapkstep.cpp | 5 | ||||
| -rw-r--r-- | src/plugins/android/androidconfigurations.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/android/androidcreatekeystorecertificate.cpp | 3 | ||||
| -rw-r--r-- | src/plugins/android/androiddeployqtstep.cpp | 3 | ||||
| -rw-r--r-- | src/plugins/android/androidsdkmanager.cpp | 2 |
5 files changed, 10 insertions, 7 deletions
diff --git a/src/plugins/android/androidbuildapkstep.cpp b/src/plugins/android/androidbuildapkstep.cpp index adf96eb68d..789e6c92fd 100644 --- a/src/plugins/android/androidbuildapkstep.cpp +++ b/src/plugins/android/androidbuildapkstep.cpp @@ -863,7 +863,7 @@ void AndroidBuildApkStep::updateBuildToolsVersionInJsonFile() if (!contents) return; - QRegularExpression regex(QLatin1String("\"sdkBuildToolsRevision\":.\"[0-9.]+\"")); + static const QRegularExpression regex(R"("sdkBuildToolsRevision":."[0-9.]+")"); QRegularExpressionMatch match = regex.match(QString::fromUtf8(contents.value())); const QString version = buildToolsVersion().toString(); if (match.hasMatch() && !version.isEmpty()) { @@ -925,7 +925,8 @@ void AndroidBuildApkStep::setBuildToolsVersion(const QVersionNumber &version) void AndroidBuildApkStep::stdError(const QString &output) { QString newOutput = output; - newOutput.remove(QRegularExpression("^(\\n)+")); + static const QRegularExpression re("^(\\n)+"); + newOutput.remove(re); if (newOutput.isEmpty()) return; diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp index 530a0bb6bd..4616cff2ae 100644 --- a/src/plugins/android/androidconfigurations.cpp +++ b/src/plugins/android/androidconfigurations.cpp @@ -306,7 +306,7 @@ void AndroidConfig::parseDependenciesJson() auto fillQtVersionsRange = [](const QString &shortVersion) { QList<QVersionNumber> versions; - const QRegularExpression re(R"(([0-9]\.[0-9]+\.)\[([0-9]+)\-([0-9]+)\])"); + static const QRegularExpression re(R"(([0-9]\.[0-9]+\.)\[([0-9]+)\-([0-9]+)\])"); QRegularExpressionMatch match = re.match(shortVersion); if (match.hasMatch() && match.lastCapturedIndex() == 3) for (int i = match.captured(2).toInt(); i <= match.captured(3).toInt(); ++i) @@ -892,7 +892,7 @@ QVersionNumber AndroidConfig::ndkVersion(const FilePath &ndkPath) // r6a // r10e (64 bit) QString content = QString::fromUtf8(reader.data()); - QRegularExpression re("(r)(?<major>[0-9]{1,2})(?<minor>[a-z]{1,1})"); + static const QRegularExpression re("(r)(?<major>[0-9]{1,2})(?<minor>[a-z]{1,1})"); QRegularExpressionMatch match = re.match(content); if (match.hasMatch()) { QString major = match.captured("major"); diff --git a/src/plugins/android/androidcreatekeystorecertificate.cpp b/src/plugins/android/androidcreatekeystorecertificate.cpp index 003eb7e9b9..e6537b8a27 100644 --- a/src/plugins/android/androidcreatekeystorecertificate.cpp +++ b/src/plugins/android/androidcreatekeystorecertificate.cpp @@ -217,7 +217,8 @@ bool AndroidCreateKeystoreCertificate::checkCertificateAlias() bool AndroidCreateKeystoreCertificate::checkCountryCode() { - if (!m_countryLineEdit->text().contains(QRegularExpression("[A-Z]{2}"))) { + static const QRegularExpression re("[A-Z]{2}"); + if (!m_countryLineEdit->text().contains(re)) { m_infoLabel->show(); m_infoLabel->setText(Tr::tr("Invalid country code.")); return false; diff --git a/src/plugins/android/androiddeployqtstep.cpp b/src/plugins/android/androiddeployqtstep.cpp index 1389f0b100..88092aef52 100644 --- a/src/plugins/android/androiddeployqtstep.cpp +++ b/src/plugins/android/androiddeployqtstep.cpp @@ -620,7 +620,8 @@ void AndroidDeployQtStep::stdError(const QString &line) emit addOutput(line, BuildStep::OutputFormat::Stderr, BuildStep::DontAppendNewline); QString newOutput = line; - newOutput.remove(QRegularExpression("^(\\n)+")); + static const QRegularExpression re("^(\\n)+"); + newOutput.remove(re); if (newOutput.isEmpty()) return; diff --git a/src/plugins/android/androidsdkmanager.cpp b/src/plugins/android/androidsdkmanager.cpp index cb46f39ab7..af5fde48be 100644 --- a/src/plugins/android/androidsdkmanager.cpp +++ b/src/plugins/android/androidsdkmanager.cpp @@ -549,7 +549,7 @@ void AndroidSdkManagerPrivate::getPendingLicense(SdkCmdPromise &fi) } else if (assertionFound) { // The first assertion is to start reviewing licenses. Always accept. reviewingLicenses = true; - QRegularExpression reg("(\\d+\\sof\\s)(?<steps>\\d+)"); + static const QRegularExpression reg(R"((\d+\sof\s)(?<steps>\d+))"); QRegularExpressionMatch match = reg.match(stdOut); if (match.hasMatch()) steps = match.captured("steps").toInt(); |