feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Replace occurrences of QStringList() << pattern

Browse Source 
Change-Id: I598d8c06193c2e72435a76165d1afc9ee3465b48
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Stenger
2017-02-09 14:00:07 +01:00
parent 7f8e60b289
commit e952b9d4f3
16 changed files with 77 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp
View File

@@ -278,35 +278,33 @@ QString QbsBuildConfiguration::equivalentCommandLine(const BuildStep *buildStep)
buildStep->project()->activeTarget()->activeBuildConfiguration());
if (buildConfig) {
const QString buildDir = buildConfig->buildDirectory().toUserOutput();
Utils::QtcProcess::addArgs(&commandLine, QStringList() << QLatin1String("-d") << buildDir);
Utils::QtcProcess::addArgs(&commandLine, QStringList({ "-d", buildDir }));
}
Utils::QtcProcess::addArgs(&commandLine, QStringList() << QLatin1String("-f")
Utils::QtcProcess::addArgs(&commandLine, QStringList("-f")
<< buildStep->project()->projectFilePath().toUserOutput());
if (QbsProjectManagerSettings::useCreatorSettingsDirForQbs()) {
Utils::QtcProcess::addArgs(&commandLine, QStringList() << QLatin1String("--settings-dir")
<< QDir::toNativeSeparators(QbsProjectManagerSettings::qbsSettingsBaseDir()));
Utils::QtcProcess::addArgs(&commandLine, QStringList({ "--settings-dir",
QDir::toNativeSeparators(QbsProjectManagerSettings::qbsSettingsBaseDir()) }));
}
if (stepProxy.dryRun())
Utils::QtcProcess::addArg(&commandLine, QLatin1String("--dry-run"));
if (stepProxy.keepGoing())
Utils::QtcProcess::addArg(&commandLine, QLatin1String("--keep-going"));
if (stepProxy.showCommandLines())
Utils::QtcProcess::addArgs(&commandLine, QStringList()
<< QLatin1String("--command-echo-mode")
<< QLatin1String("command-line"));
Utils::QtcProcess::addArgs(&commandLine, QStringList({ "--command-echo-mode",
"command-line" }));
if (stepProxy.noInstall())
Utils::QtcProcess::addArg(&commandLine, QLatin1String("--no-install"));
if (stepProxy.cleanInstallRoot())
Utils::QtcProcess::addArg(&commandLine, QLatin1String("--clean-install-root"));
const int jobCount = stepProxy.jobCount();
if (jobCount > 0) {
Utils::QtcProcess::addArgs(&commandLine, QStringList() << QLatin1String("--jobs")
<< QString::number(jobCount));
Utils::QtcProcess::addArgs(&commandLine, QStringList({ "--jobs",
QString::number(jobCount) }));
}
const QString installRoot = stepProxy.installRoot();
if (!installRoot.isEmpty()) {
Utils::QtcProcess::addArgs(&commandLine, QStringList() << QLatin1String("--install-root")
<< installRoot);
Utils::QtcProcess::addArgs(&commandLine, QStringList({ "--install-root", installRoot }));
}
const QString profileName = QbsManager::instance()->profileForKit(buildStep->target()->kit());

3
src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp
View File

@@ -476,8 +476,7 @@ void QbsProjectManagerPlugin::buildFiles(QbsProject *project, const QStringList
void QbsProjectManagerPlugin::buildSingleFile(QbsProject *project, const QString &file)
{
buildFiles(project, QStringList(file), QStringList()
<< QLatin1String("obj") << QLatin1String("hpp"));
buildFiles(project, QStringList(file), QStringList({ "obj", "hpp" }));
}
void QbsProjectManagerPlugin::buildProducts(QbsProject *project, const QStringList &products)