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

Generic Project: Add some missing QLatin1String's.

Browse Source 
Change-Id: I0a3276dde7a3b8f90487c642d839611c80f53cf9
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
Andre Hartmann
2012-06-04 17:22:50 +02:00
committed by Daniel Teske
parent 8bf072db97
commit 566fa173b4
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/genericprojectmanager/genericbuildconfiguration.cpp
View File

@@ -188,12 +188,12 @@ BuildConfiguration *GenericBuildConfigurationFactory::create(ProjectExplorer::Ta
Q_ASSERT(buildSteps); Q_ASSERT(buildSteps);
GenericMakeStep *makeStep = new GenericMakeStep(buildSteps); GenericMakeStep *makeStep = new GenericMakeStep(buildSteps);
buildSteps->insertStep(0, makeStep); buildSteps->insertStep(0, makeStep);
makeStep->setBuildTarget("all", /* on = */ true); makeStep->setBuildTarget(QLatin1String("all"), /* on = */ true);
Q_ASSERT(cleanSteps); Q_ASSERT(cleanSteps);
GenericMakeStep *cleanMakeStep = new GenericMakeStep(cleanSteps); GenericMakeStep *cleanMakeStep = new GenericMakeStep(cleanSteps);
cleanSteps->insertStep(0, cleanMakeStep); cleanSteps->insertStep(0, cleanMakeStep);
cleanMakeStep->setBuildTarget("clean", /* on = */ true); cleanMakeStep->setBuildTarget(QLatin1String("clean"), /* on = */ true);
cleanMakeStep->setClean(true); cleanMakeStep->setClean(true);
target->addBuildConfiguration(bc); // also makes the name unique... target->addBuildConfiguration(bc); // also makes the name unique...

4
src/plugins/genericprojectmanager/genericmakestep.cpp
View File

@@ -331,9 +331,9 @@ ProjectExplorer::BuildStep *GenericMakeStepFactory::create(ProjectExplorer::Buil
GenericMakeStep *step = new GenericMakeStep(parent); GenericMakeStep *step = new GenericMakeStep(parent);
if (parent->id() == Core::Id(ProjectExplorer::Constants::BUILDSTEPS_CLEAN)) { if (parent->id() == Core::Id(ProjectExplorer::Constants::BUILDSTEPS_CLEAN)) {
step->setClean(true); step->setClean(true);
step->setBuildTarget("clean", /* on = */ true); step->setBuildTarget(QLatin1String("clean"), /* on = */ true);
} else if (parent->id() == Core::Id(ProjectExplorer::Constants::BUILDSTEPS_BUILD)) { } else if (parent->id() == Core::Id(ProjectExplorer::Constants::BUILDSTEPS_BUILD)) {
step->setBuildTarget("all", /* on = */ true); step->setBuildTarget(QLatin1String("all"), /* on = */ true);
} }
return step; return step;
} }

6
src/plugins/genericprojectmanager/generictarget.cpp
View File

@@ -131,18 +131,18 @@ GenericTarget *GenericTargetFactory::create(ProjectExplorer::Project *parent, co
// Set up BuildConfiguration: // Set up BuildConfiguration:
GenericBuildConfiguration *bc = new GenericBuildConfiguration(t); GenericBuildConfiguration *bc = new GenericBuildConfiguration(t);
bc->setDisplayName("all"); bc->setDisplayName(QLatin1String("all"));
ProjectExplorer::BuildStepList *buildSteps = bc->stepList(ProjectExplorer::Constants::BUILDSTEPS_BUILD); ProjectExplorer::BuildStepList *buildSteps = bc->stepList(ProjectExplorer::Constants::BUILDSTEPS_BUILD);
ProjectExplorer::BuildStepList *cleanSteps = bc->stepList(ProjectExplorer::Constants::BUILDSTEPS_CLEAN); ProjectExplorer::BuildStepList *cleanSteps = bc->stepList(ProjectExplorer::Constants::BUILDSTEPS_CLEAN);
GenericMakeStep *makeStep = new GenericMakeStep(buildSteps); GenericMakeStep *makeStep = new GenericMakeStep(buildSteps);
buildSteps->insertStep(0, makeStep); buildSteps->insertStep(0, makeStep);
makeStep->setBuildTarget("all", /* on = */ true); makeStep->setBuildTarget(QLatin1String("all"), /* on = */ true);
GenericMakeStep *cleanMakeStep = new GenericMakeStep(cleanSteps); GenericMakeStep *cleanMakeStep = new GenericMakeStep(cleanSteps);
cleanSteps->insertStep(0, cleanMakeStep); cleanSteps->insertStep(0, cleanMakeStep);
cleanMakeStep->setBuildTarget("clean", /* on = */ true); cleanMakeStep->setBuildTarget(QLatin1String("clean"), /* on = */ true);
cleanMakeStep->setClean(true); cleanMakeStep->setClean(true);
bc->setBuildDirectory(genericproject->projectDirectory()); bc->setBuildDirectory(genericproject->projectDirectory());