diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/app/qbs-setup-toolchains/keilprobe.cpp | 3 | ||||
-rw-r--r-- | src/app/qbs-setup-toolchains/xcodeprobe.cpp | 2 | ||||
-rw-r--r-- | src/lib/corelib/api/runenvironment.cpp | 9 | ||||
-rw-r--r-- | src/lib/corelib/buildgraph/buildgraphloader.cpp | 4 | ||||
-rw-r--r-- | src/lib/corelib/jsextensions/process.cpp | 5 | ||||
-rw-r--r-- | src/lib/corelib/language/moduleloader.cpp | 2 | ||||
-rw-r--r-- | src/plugins/generator/clangcompilationdb/clangcompilationdbgenerator.cpp | 6 | ||||
-rw-r--r-- | src/plugins/generator/visualstudio/msbuildutils.h | 6 | ||||
-rw-r--r-- | src/plugins/generator/visualstudio/visualstudiogenerator.cpp | 10 |
9 files changed, 19 insertions, 28 deletions
diff --git a/src/app/qbs-setup-toolchains/keilprobe.cpp b/src/app/qbs-setup-toolchains/keilprobe.cpp index 0f3bcca04..a4b61397a 100644 --- a/src/app/qbs-setup-toolchains/keilprobe.cpp +++ b/src/app/qbs-setup-toolchains/keilprobe.cpp @@ -184,8 +184,7 @@ static Version dumpMcsCompilerVersion(const QFileInfo &compiler) if (verCode < 0) { qbsWarning() << Tr::tr("No %1 tokens was found" " in the compiler dump:\n%2") - .arg(knownKeys.join(QLatin1Char(','))) - .arg(QString::fromUtf8(dump)); + .arg(knownKeys.join(QLatin1Char(',')), QString::fromUtf8(dump)); return Version{}; } return Version{verCode / 100, verCode % 100}; diff --git a/src/app/qbs-setup-toolchains/xcodeprobe.cpp b/src/app/qbs-setup-toolchains/xcodeprobe.cpp index 6f740a93a..bb246742f 100644 --- a/src/app/qbs-setup-toolchains/xcodeprobe.cpp +++ b/src/app/qbs-setup-toolchains/xcodeprobe.cpp @@ -171,7 +171,7 @@ void XcodeProbe::detectDeveloperPaths() void XcodeProbe::setupDefaultToolchains(const QString &devPath, const QString &xcodeName) { - qbsInfo() << Tr::tr("Profile '%1' created for '%2'.").arg(xcodeName).arg(devPath); + qbsInfo() << Tr::tr("Profile '%1' created for '%2'.").arg(xcodeName, devPath); Profile installationProfile(xcodeName, settings); installationProfile.removeProfile(); diff --git a/src/lib/corelib/api/runenvironment.cpp b/src/lib/corelib/api/runenvironment.cpp index f54914964..1bd9735ee 100644 --- a/src/lib/corelib/api/runenvironment.cpp +++ b/src/lib/corelib/api/runenvironment.cpp @@ -313,8 +313,7 @@ int RunEnvironment::doRunTarget(const QString &targetBin, const QStringList &arg if (!process.waitForFinished(-1)) { if (process.error() == QProcess::FailedToStart) { throw ErrorInfo(Tr::tr("The process '%1' could not be started: %2") - .arg(targetExecutable) - .arg(process.errorString())); + .arg(targetExecutable, process.errorString())); } else { d->logger.qbsWarning() << "QProcess error: " << process.errorString(); @@ -353,8 +352,7 @@ int RunEnvironment::doRunTarget(const QString &targetBin, const QStringList &arg if (!process.waitForFinished(-1)) { if (process.error() == QProcess::FailedToStart) { throw ErrorInfo(Tr::tr("The process '%1' could not be started: %2") - .arg(targetExecutable) - .arg(process.errorString())); + .arg(targetExecutable, process.errorString())); } return EXIT_FAILURE; @@ -458,8 +456,7 @@ int RunEnvironment::doRunTarget(const QString &targetBin, const QStringList &arg } #endif throw ErrorInfo(Tr::tr("The process '%1' could not be started: %2") - .arg(targetExecutable) - .arg(errorPrefixString + process.errorString())); + .arg(targetExecutable, errorPrefixString + process.errorString())); } else { d->logger.qbsWarning() << "QProcess error: " << process.errorString(); diff --git a/src/lib/corelib/buildgraph/buildgraphloader.cpp b/src/lib/corelib/buildgraph/buildgraphloader.cpp index f1a5e5cb9..73c84db8e 100644 --- a/src/lib/corelib/buildgraph/buildgraphloader.cpp +++ b/src/lib/corelib/buildgraph/buildgraphloader.cpp @@ -884,8 +884,8 @@ bool BuildGraphLoader::checkConfigCompatibility() "New property values: %2\n" "Use the 'resolve' command if " "you really want to rebuild with the new properties.") - .arg(toUserOutput(restoredProject->overriddenValues)) - .arg(toUserOutput(m_parameters.overriddenValues()))); + .arg(toUserOutput(restoredProject->overriddenValues), + toUserOutput(m_parameters.overriddenValues()))); } m_parameters.setOverriddenValues(restoredProject->overriddenValues); if (m_parameters.topLevelProfile() != restoredProject->profile()) { diff --git a/src/lib/corelib/jsextensions/process.cpp b/src/lib/corelib/jsextensions/process.cpp index 8257be6dc..f0c3c4705 100644 --- a/src/lib/corelib/jsextensions/process.cpp +++ b/src/lib/corelib/jsextensions/process.cpp @@ -209,8 +209,9 @@ int Process::exec(const QString &program, const QStringList &arguments, bool thr } else if (m_qProcess->exitStatus() == QProcess::CrashExit || m_qProcess->exitCode() != 0) { QString errorMessage = m_qProcess->error() == QProcess::Crashed ? Tr::tr("Error running '%1': %2").arg(program, m_qProcess->errorString()) - : Tr::tr("Process '%1 %2' finished with exit code %3.").arg(program). - arg(arguments.join(QStringLiteral(" "))).arg(m_qProcess->exitCode()); + : Tr::tr("Process '%1 %2' finished with exit code %3.") + .arg(program, arguments.join(QStringLiteral(" "))) + .arg(m_qProcess->exitCode()); const QString stdOut = readStdOut(); if (!stdOut.isEmpty()) errorMessage.append(Tr::tr(" The standard output was:\n")).append(stdOut); diff --git a/src/lib/corelib/language/moduleloader.cpp b/src/lib/corelib/language/moduleloader.cpp index 6b800fa0b..2f109256c 100644 --- a/src/lib/corelib/language/moduleloader.cpp +++ b/src/lib/corelib/language/moduleloader.cpp @@ -1800,7 +1800,7 @@ void ModuleLoader::handlePropertyOptions(Item *optionsItem) if (property && decl.isExpired()) { ErrorInfo e(Tr::tr("Property '%1' was scheduled for removal in version %2, but " "is still present.") - .arg(name).arg(removalVersion.toString()), + .arg(name, removalVersion.toString()), property->location()); e.append(Tr::tr("Removal version for '%1' specified here.").arg(name), optionsItem->location()); diff --git a/src/plugins/generator/clangcompilationdb/clangcompilationdbgenerator.cpp b/src/plugins/generator/clangcompilationdb/clangcompilationdbgenerator.cpp index 3676d079e..cdf95135d 100644 --- a/src/plugins/generator/clangcompilationdb/clangcompilationdbgenerator.cpp +++ b/src/plugins/generator/clangcompilationdb/clangcompilationdbgenerator.cpp @@ -130,13 +130,11 @@ void ClangCompilationDatabaseGenerator::writeProjectDatabase(const QString &file if (!databaseFile.open(QFile::WriteOnly)) throw ErrorInfo(Tr::tr("Cannot open '%1' for writing: %2") - .arg(filePath) - .arg(databaseFile.errorString())); + .arg(filePath, databaseFile.errorString())); if (databaseFile.write(database.toJson()) == -1) throw ErrorInfo(Tr::tr("Error while writing '%1': %2") - .arg(filePath) - .arg(databaseFile.errorString())); + .arg(filePath, databaseFile.errorString())); } bool ClangCompilationDatabaseGenerator::hasValidInputFileTag(const QStringList &fileTags) const diff --git a/src/plugins/generator/visualstudio/msbuildutils.h b/src/plugins/generator/visualstudio/msbuildutils.h index 3eceeba2e..cf4c7eb0d 100644 --- a/src/plugins/generator/visualstudio/msbuildutils.h +++ b/src/plugins/generator/visualstudio/msbuildutils.h @@ -92,14 +92,12 @@ public: static QString fullDisplayName(const qbs::Project &project) { - return QStringLiteral("%1|%2") - .arg(configurationName(project)) - .arg(displayPlatform(project)); + return QStringLiteral("%1|%2").arg(configurationName(project), displayPlatform(project)); } static QString fullName(const qbs::Project &project) { - return QStringLiteral("%1|%2").arg(configurationName(project)).arg(platform(project)); + return QStringLiteral("%1|%2").arg(configurationName(project), platform(project)); } static QString buildTaskCondition(const Project &buildTask) diff --git a/src/plugins/generator/visualstudio/visualstudiogenerator.cpp b/src/plugins/generator/visualstudio/visualstudiogenerator.cpp index 8d50bb5f1..ae95e2108 100644 --- a/src/plugins/generator/visualstudio/visualstudiogenerator.cpp +++ b/src/plugins/generator/visualstudio/visualstudiogenerator.cpp @@ -224,14 +224,12 @@ static void addDefaultGlobalSections(const GeneratableProject &topLevelProject, for (const auto project : projects) { for (const auto &qbsProject : topLevelProject.projects) { projectConfigurationPlatformsSection->appendProperty( - QStringLiteral("%1.%2.ActiveCfg") - .arg(project->guid().toString()) - .arg(MSBuildUtils::fullDisplayName(qbsProject)), + QStringLiteral("%1.%2.ActiveCfg").arg(project->guid().toString(), + MSBuildUtils::fullDisplayName(qbsProject)), MSBuildUtils::fullName(qbsProject)); projectConfigurationPlatformsSection->appendProperty( - QStringLiteral("%1.%2.Build.0") - .arg(project->guid().toString()) - .arg(MSBuildUtils::fullDisplayName(qbsProject)), + QStringLiteral("%1.%2.Build.0").arg(project->guid().toString(), + MSBuildUtils::fullDisplayName(qbsProject)), MSBuildUtils::fullName(qbsProject)); } } |