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

Mobile platforms: Do not use QLatin1String in BuildSteps

Browse Source 
Change-Id: I3d67e94e7dc2d86ac1eba641562ee4a045f95d6c
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
This commit is contained in:
Tobias Hunger
2017-06-12 14:23:06 +02:00
parent 05e0b001d3
commit 190f2d9e8d
3 changed files with 34 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/plugins/ios/iosbuildstep.cpp
View File

@@ -145,18 +145,18 @@ QVariantMap IosBuildStep::toMap() const
{
QVariantMap map(AbstractProcessStep::toMap());
map.insert(QLatin1String(BUILD_ARGUMENTS_KEY), m_baseBuildArguments);
map.insert(QLatin1String(BUILD_USE_DEFAULT_ARGS_KEY), m_useDefaultArguments);
map.insert(QLatin1String(CLEAN_KEY), m_clean);
map.insert(BUILD_ARGUMENTS_KEY, m_baseBuildArguments);
map.insert(BUILD_USE_DEFAULT_ARGS_KEY, m_useDefaultArguments);
map.insert(CLEAN_KEY, m_clean);
return map;
}
bool IosBuildStep::fromMap(const QVariantMap &map)
{
QVariant bArgs = map.value(QLatin1String(BUILD_ARGUMENTS_KEY));
QVariant bArgs = map.value(BUILD_ARGUMENTS_KEY);
m_baseBuildArguments = bArgs.toStringList();
m_useDefaultArguments = map.value(QLatin1String(BUILD_USE_DEFAULT_ARGS_KEY)).toBool();
m_clean = map.value(QLatin1String(CLEAN_KEY)).toBool();
m_useDefaultArguments = map.value(BUILD_USE_DEFAULT_ARGS_KEY).toBool();
m_clean = map.value(CLEAN_KEY).toBool();
return BuildStep::fromMap(map);
}
@@ -173,11 +173,11 @@ QStringList IosBuildStep::defaultArguments() const
ToolChain *tc = ToolChainKitInformation::toolChain(kit, ProjectExplorer::Constants::CXX_LANGUAGE_ID);
switch (target()->activeBuildConfiguration()->buildType()) {
case BuildConfiguration::Debug :
res << QLatin1String("-configuration") << QLatin1String("Debug");
res << "-configuration" << "Debug";
break;
case BuildConfiguration::Release :
case BuildConfiguration::Profile :
res << QLatin1String("-configuration") << QLatin1String("Release");
res << "-configuration" << "Release";
break;
case BuildConfiguration::Unknown :
break;
@@ -191,14 +191,14 @@ QStringList IosBuildStep::defaultArguments() const
res << gtc->platformCodeGenFlags();
}
if (!SysRootKitInformation::sysRoot(kit).isEmpty())
res << QLatin1String("-sdk") << SysRootKitInformation::sysRoot(kit).toString();
res << QLatin1String("SYMROOT=") + IosManager::resDirForTarget(target());
res << "-sdk" << SysRootKitInformation::sysRoot(kit).toString();
res << "SYMROOT=" + IosManager::resDirForTarget(target());
return res;
}
QString IosBuildStep::buildCommand() const
{
return QLatin1String("xcodebuild"); // add path?
return "xcodebuild"; // add path?
}
void IosBuildStep::run(QFutureInterface<bool> &fi)
@@ -334,7 +334,7 @@ BuildStep *IosBuildStepFactory::create(BuildStepList *parent, const Id id)
IosBuildStep *step = new IosBuildStep(parent);
if (parent->id() == ProjectExplorer::Constants::BUILDSTEPS_CLEAN) {
step->setClean(true);
step->setExtraArguments(QStringList(QLatin1String("clean")));
step->setExtraArguments(QStringList("clean"));
} else if (parent->id() == ProjectExplorer::Constants::BUILDSTEPS_BUILD) {
// nomal setup
}

28
src/plugins/ios/iosdsymbuildstep.cpp
View File

@@ -112,23 +112,23 @@ QVariantMap IosPresetBuildStep::toMap() const
{
QVariantMap map(AbstractProcessStep::toMap());
map.insert(id().withSuffix(QLatin1String(ARGUMENTS_PARTIAL_KEY)).toString(),
map.insert(id().withSuffix(ARGUMENTS_PARTIAL_KEY).toString(),
arguments());
map.insert(id().withSuffix(QLatin1String(USE_DEFAULT_ARGS_PARTIAL_KEY)).toString(),
map.insert(id().withSuffix(USE_DEFAULT_ARGS_PARTIAL_KEY).toString(),
isDefault());
map.insert(id().withSuffix(QLatin1String(CLEAN_PARTIAL_KEY)).toString(), m_clean);
map.insert(id().withSuffix(QLatin1String(COMMAND_PARTIAL_KEY)).toString(), command());
map.insert(id().withSuffix(CLEAN_PARTIAL_KEY).toString(), m_clean);
map.insert(id().withSuffix(COMMAND_PARTIAL_KEY).toString(), command());
return map;
}
bool IosPresetBuildStep::fromMap(const QVariantMap &map)
{
QVariant bArgs = map.value(id().withSuffix(QLatin1String(ARGUMENTS_PARTIAL_KEY)).toString());
QVariant bArgs = map.value(id().withSuffix(ARGUMENTS_PARTIAL_KEY).toString());
m_arguments = bArgs.toStringList();
bool useDefaultArguments = map.value(
id().withSuffix(QLatin1String(USE_DEFAULT_ARGS_PARTIAL_KEY)).toString()).toBool();
m_clean = map.value(id().withSuffix(QLatin1String(CLEAN_PARTIAL_KEY)).toString(), m_clean).toBool();
m_command = map.value(id().withSuffix(QLatin1String(COMMAND_PARTIAL_KEY)).toString(), m_command)
id().withSuffix(USE_DEFAULT_ARGS_PARTIAL_KEY).toString()).toBool();
m_clean = map.value(id().withSuffix(CLEAN_PARTIAL_KEY).toString(), m_clean).toBool();
m_command = map.value(id().withSuffix(COMMAND_PARTIAL_KEY).toString(), m_command)
.toString();
if (useDefaultArguments) {
m_command = defaultCommand();
@@ -380,7 +380,7 @@ IosPresetBuildStep *IosDsymBuildStepFactory::createPresetStep(BuildStepList *par
IosDsymBuildStep::IosDsymBuildStep(BuildStepList *parent, const Id id)
: IosPresetBuildStep(parent, id)
{
setDefaultDisplayName(QLatin1String("dsymutil"));
setDefaultDisplayName("dsymutil");
}
QStringList IosDsymBuildStep::defaultCleanCmdList() const
@@ -390,23 +390,23 @@ QStringList IosDsymBuildStep::defaultCleanCmdList() const
QTC_ASSERT(runConf, return QStringList("echo"));
QString dsymPath = runConf->bundleDirectory().toUserOutput();
dsymPath.chop(4);
dsymPath.append(QLatin1String(".dSYM"));
dsymPath.append(".dSYM");
return QStringList({"rm", "-rf", dsymPath});
}
QStringList IosDsymBuildStep::defaultCmdList() const
{
QString dsymutilCmd = QLatin1String("dsymutil");
QString dsymutilCmd = "dsymutil";
Utils::FileName dsymUtilPath = IosConfigurations::developerPath()
.appendPath(QLatin1String("Toolchains/XcodeDefault.xctoolchain/usr/bin/dsymutil"));
.appendPath("Toolchains/XcodeDefault.xctoolchain/usr/bin/dsymutil");
if (dsymUtilPath.exists())
dsymutilCmd = dsymUtilPath.toUserOutput();
IosRunConfiguration *runConf =
qobject_cast<IosRunConfiguration *>(target()->activeRunConfiguration());
QTC_ASSERT(runConf, return QStringList(QLatin1String("echo")));
QTC_ASSERT(runConf, return QStringList("echo"));
QString dsymPath = runConf->bundleDirectory().toUserOutput();
dsymPath.chop(4);
dsymPath.append(QLatin1String(".dSYM"));
dsymPath.append(".dSYM");
return QStringList({dsymutilCmd, "-o", dsymPath, runConf->localExecutable().toUserOutput()});
}