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/projectexplorer/abstractprocessstep.cpp | |
| 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/projectexplorer/abstractprocessstep.cpp')
| -rw-r--r-- | src/plugins/projectexplorer/abstractprocessstep.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/projectexplorer/abstractprocessstep.cpp b/src/plugins/projectexplorer/abstractprocessstep.cpp index fd3a22e6f8..6073a168e6 100644 --- a/src/plugins/projectexplorer/abstractprocessstep.cpp +++ b/src/plugins/projectexplorer/abstractprocessstep.cpp @@ -200,7 +200,7 @@ bool AbstractProcessStep::init() void AbstractProcessStep::doRun() { - QDir wd(d->m_param.effectiveWorkingDirectory()); + QDir wd(d->m_param.effectiveWorkingDirectory().toString()); if (!wd.exists()) { if (!wd.mkpath(wd.absolutePath())) { emit addOutput(tr("Could not create directory \"%1\"") @@ -211,7 +211,7 @@ void AbstractProcessStep::doRun() } } - QString effectiveCommand = d->m_param.effectiveCommand(); + QString effectiveCommand = d->m_param.effectiveCommand().toString(); if (!QFileInfo::exists(effectiveCommand)) { processStartupFailed(); finish(false); @@ -275,7 +275,7 @@ void AbstractProcessStep::cleanUp(QProcess *process) void AbstractProcessStep::processStarted() { emit addOutput(tr("Starting: \"%1\" %2") - .arg(QDir::toNativeSeparators(d->m_param.effectiveCommand()), + .arg(QDir::toNativeSeparators(d->m_param.effectiveCommand().toString()), d->m_param.prettyArguments()), BuildStep::OutputFormat::NormalMessage); } @@ -291,7 +291,7 @@ void AbstractProcessStep::processFinished(int exitCode, QProcess::ExitStatus sta if (d->m_outputParserChain) d->m_outputParserChain->flush(); - QString command = QDir::toNativeSeparators(d->m_param.effectiveCommand()); + QString command = QDir::toNativeSeparators(d->m_param.effectiveCommand().toString()); if (status == QProcess::NormalExit && exitCode == 0) { emit addOutput(tr("The process \"%1\" exited normally.").arg(command), BuildStep::OutputFormat::NormalMessage); @@ -313,7 +313,7 @@ void AbstractProcessStep::processFinished(int exitCode, QProcess::ExitStatus sta void AbstractProcessStep::processStartupFailed() { emit addOutput(tr("Could not start process \"%1\" %2") - .arg(QDir::toNativeSeparators(d->m_param.effectiveCommand()), + .arg(QDir::toNativeSeparators(d->m_param.effectiveCommand().toString()), d->m_param.prettyArguments()), BuildStep::OutputFormat::ErrorMessage); } |