diff options
author | hjk <hjk@qt.io> | 2019-05-15 13:59:43 +0200 |
---|---|---|
committer | hjk <hjk@qt.io> | 2019-05-15 12:55:22 +0000 |
commit | 9433b8a7e78cfbe13a3dfe4ad489c4329a701b47 (patch) | |
tree | 3d2c2b60960a212cb8387165b7c92746e3caab29 /src/plugins/ios | |
parent | d1f9e466daf369969bc0dae8c14914ed79c3acb5 (diff) |
ProjectExplorer: Use Utils::FileName in ProcessParameters
For the command and the working directory.
Change-Id: Ia69dc7100aeb57bb6e1b35f4dd4f3cf3763d8cda
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/plugins/ios')
-rw-r--r-- | src/plugins/ios/iosbuildstep.cpp | 8 | ||||
-rw-r--r-- | src/plugins/ios/iosdsymbuildstep.cpp | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/plugins/ios/iosbuildstep.cpp b/src/plugins/ios/iosbuildstep.cpp index 5b99ac65299..18616684ad5 100644 --- a/src/plugins/ios/iosbuildstep.cpp +++ b/src/plugins/ios/iosbuildstep.cpp @@ -87,11 +87,11 @@ bool IosBuildStep::init() ProcessParameters *pp = processParameters(); pp->setMacroExpander(bc->macroExpander()); - pp->setWorkingDirectory(bc->buildDirectory().toString()); + pp->setWorkingDirectory(bc->buildDirectory()); Utils::Environment env = bc->environment(); Utils::Environment::setupEnglishOutput(&env); pp->setEnvironment(env); - pp->setCommand(buildCommand()); + pp->setCommand(Utils::FileName::fromString(buildCommand())); pp->setArguments(Utils::QtcProcess::joinArgs(allArguments())); pp->resolveAll(); @@ -251,9 +251,9 @@ void IosBuildStepConfigWidget::updateDetails() ProcessParameters param; param.setMacroExpander(bc->macroExpander()); - param.setWorkingDirectory(bc->buildDirectory().toString()); + param.setWorkingDirectory(bc->buildDirectory()); param.setEnvironment(bc->environment()); - param.setCommand(m_buildStep->buildCommand()); + param.setCommand(Utils::FileName::fromString(m_buildStep->buildCommand())); param.setArguments(Utils::QtcProcess::joinArgs(m_buildStep->allArguments())); setSummaryText(param.summary(displayName())); diff --git a/src/plugins/ios/iosdsymbuildstep.cpp b/src/plugins/ios/iosdsymbuildstep.cpp index c8b550352c1..f9cac493529 100644 --- a/src/plugins/ios/iosdsymbuildstep.cpp +++ b/src/plugins/ios/iosdsymbuildstep.cpp @@ -68,11 +68,11 @@ bool IosDsymBuildStep::init() ProcessParameters *pp = processParameters(); pp->setMacroExpander(bc->macroExpander()); - pp->setWorkingDirectory(bc->buildDirectory().toString()); + pp->setWorkingDirectory(bc->buildDirectory()); Utils::Environment env = bc->environment(); Utils::Environment::setupEnglishOutput(&env); pp->setEnvironment(env); - pp->setCommand(command()); + pp->setCommand(Utils::FileName::fromString(command())); pp->setArguments(Utils::QtcProcess::joinArgs(arguments())); pp->resolveAll(); @@ -268,9 +268,9 @@ void IosDsymBuildStepConfigWidget::updateDetails() ProcessParameters param; param.setMacroExpander(bc->macroExpander()); - param.setWorkingDirectory(bc->buildDirectory().toString()); + param.setWorkingDirectory(bc->buildDirectory()); param.setEnvironment(bc->environment()); - param.setCommand(m_buildStep->command()); + param.setCommand(Utils::FileName::fromString(m_buildStep->command())); param.setArguments(Utils::QtcProcess::joinArgs(m_buildStep->arguments())); setSummaryText(param.summary(displayName())); |