diff options
7 files changed, 12 insertions, 9 deletions
diff --git a/src/app/qbs-setup-android/android-setup.cpp b/src/app/qbs-setup-android/android-setup.cpp index a0a9d2948..329bd0052 100644 --- a/src/app/qbs-setup-android/android-setup.cpp +++ b/src/app/qbs-setup-android/android-setup.cpp @@ -131,7 +131,8 @@ static QtAndroidInfo getInfoForQtDir(const QString &qtDir) if (isArchLine) { info.archs << mapArch(rhs); } else if (isAbisLine) { - for (const QString &abi: rhs.split(QLatin1Char(' '))) + const auto abis = rhs.split(QLatin1Char(' ')); + for (const QString &abi: abis) info.archs << mapArch(abi); } else { info.platform = rhs; @@ -152,7 +153,7 @@ static QtInfoPerArch getQtAndroidInfo(const QString &qtSdkDir) QDirIterator dit(qtSdkDir, nameFilters, QDir::Dirs); while (dit.hasNext()) qtDirs << dit.next(); - for (const auto &qtDir : qtDirs) { + for (const auto &qtDir : qAsConst(qtDirs)) { const QtAndroidInfo info = getInfoForQtDir(qtDir); if (info.isValid()) { for (const QString &arch: info.archs) diff --git a/src/app/qbs-setup-toolchains/gccprobe.cpp b/src/app/qbs-setup-toolchains/gccprobe.cpp index 6cbe246a5..c521a3fed 100644 --- a/src/app/qbs-setup-toolchains/gccprobe.cpp +++ b/src/app/qbs-setup-toolchains/gccprobe.cpp @@ -533,7 +533,7 @@ void gccProbe(Settings *settings, std::vector<Profile> &profiles, const QString std::vector<QFileInfo> candidates; const auto filters = buildCompilerNameFilters(compilerName); - for (const auto &searchPath : searchPaths) { + for (const auto &searchPath : qAsConst(searchPaths)) { const QDir dir(searchPath); const QStringList fileNames = dir.entryList( filters, QDir::Files | QDir::Executable); diff --git a/src/lib/corelib/buildgraph/processcommandexecutor.cpp b/src/lib/corelib/buildgraph/processcommandexecutor.cpp index 7cde8553c..b54e05969 100644 --- a/src/lib/corelib/buildgraph/processcommandexecutor.cpp +++ b/src/lib/corelib/buildgraph/processcommandexecutor.cpp @@ -393,7 +393,7 @@ void ProcessCommandExecutor::doReportCommandDescription(const QString &productNa if (m_echoMode == CommandEchoModeCommandLineWithEnvironment) { QStringList keys = m_commandEnvironment.keys(); keys.sort(); - for (const QString &key : keys) + for (const QString &key : qAsConst(keys)) fullInvocation += environmentVariableString(key, m_commandEnvironment.value(key)); } fullInvocation += m_shellInvocation; diff --git a/src/lib/corelib/language/moduleloader.cpp b/src/lib/corelib/language/moduleloader.cpp index 3eebdfd7c..57c94dcce 100644 --- a/src/lib/corelib/language/moduleloader.cpp +++ b/src/lib/corelib/language/moduleloader.cpp @@ -848,7 +848,7 @@ ModuleLoader::MultiplexInfo ModuleLoader::extractMultiplexInfo(Item *productItem static const QString mpmKey = QStringLiteral("multiplexMap"); const QScriptValue multiplexMap = m_evaluator->value(qbsModuleItem, mpmKey); - QStringList multiplexByQbsProperties = m_evaluator->stringListValue( + const QStringList multiplexByQbsProperties = m_evaluator->stringListValue( productItem, StringConstants::multiplexByQbsPropertiesProperty()); MultiplexInfo multiplexInfo; diff --git a/src/lib/corelib/tools/msvcinfo.cpp b/src/lib/corelib/tools/msvcinfo.cpp index 5097ca2e1..42cfefe7b 100644 --- a/src/lib/corelib/tools/msvcinfo.cpp +++ b/src/lib/corelib/tools/msvcinfo.cpp @@ -281,12 +281,14 @@ static QString formatVswhereOutput(const QString &out, const QString &err) QString ret; if (!out.isEmpty()) { ret.append(Tr::tr("stdout")).append(QLatin1String(":\n")); - for (const QString &line : out.split(QLatin1Char('\n'))) + const auto lines = out.split(QLatin1Char('\n')); + for (const QString &line : lines) ret.append(QLatin1Char('\t')).append(line).append(QLatin1Char('\n')); } if (!err.isEmpty()) { ret.append(Tr::tr("stderr")).append(QLatin1String(":\n")); - for (const QString &line : err.split(QLatin1Char('\n'))) + const auto lines = err.split(QLatin1Char('\n')); + for (const QString &line : lines) ret.append(QLatin1Char('\t')).append(line).append(QLatin1Char('\n')); } return ret; diff --git a/src/plugins/generator/iarew/archs/mcs51/mcs51generalsettingsgroup_v10.cpp b/src/plugins/generator/iarew/archs/mcs51/mcs51generalsettingsgroup_v10.cpp index 8aa87794b..b0c4b9368 100644 --- a/src/plugins/generator/iarew/archs/mcs51/mcs51generalsettingsgroup_v10.cpp +++ b/src/plugins/generator/iarew/archs/mcs51/mcs51generalsettingsgroup_v10.cpp @@ -237,7 +237,7 @@ struct TargetPageOptions final } const QString toolkitPath = IarewUtils::toolkitRootPath(qbsProduct); - for (const QVariant &configPath : configPaths) { + for (const QVariant &configPath : qAsConst(configPaths)) { const QString fullConfigPath = configPath.toString(); // We interested only in a config paths shipped inside of a toolkit. if (!fullConfigPath.startsWith(toolkitPath, Qt::CaseInsensitive)) diff --git a/src/plugins/generator/makefilegenerator/makefilegenerator.cpp b/src/plugins/generator/makefilegenerator/makefilegenerator.cpp index af798965a..e07dda133 100644 --- a/src/plugins/generator/makefilegenerator/makefilegenerator.cpp +++ b/src/plugins/generator/makefilegenerator/makefilegenerator.cpp @@ -167,7 +167,7 @@ void qbs::MakefileGenerator::generate() } QTextStream stream(&makefile); ErrorInfo error; - ProjectTransformerData projectTransformerData = theProject.transformerData(&error); + const ProjectTransformerData projectTransformerData = theProject.transformerData(&error); if (error.hasError()) throw error; stream << "# This file was generated by qbs" << "\n\n"; |