Commit b9c64a39 authored by Friedemann Kleint's avatar Friedemann Kleint

Fix slashes of displayed make commands.

Change-Id: Ic35966fd86c40ba0b02d48f7bf0e19ab30779c97
Reviewed-by: default avatarDaniel Teske <daniel.teske@digia.com>
parent a22e2caa
...@@ -47,6 +47,8 @@ ...@@ -47,6 +47,8 @@
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <utils/qtcprocess.h> #include <utils/qtcprocess.h>
#include <QDir>
using namespace Core; using namespace Core;
using namespace ProjectExplorer; using namespace ProjectExplorer;
...@@ -290,7 +292,7 @@ void GenericMakeStepConfigWidget::updateMakeOverrrideLabel() ...@@ -290,7 +292,7 @@ void GenericMakeStepConfigWidget::updateMakeOverrrideLabel()
if (!bc) if (!bc)
bc = m_makeStep->target()->activeBuildConfiguration(); bc = m_makeStep->target()->activeBuildConfiguration();
m_ui->makeLabel->setText(tr("Override %1:").arg(m_makeStep->makeCommand(bc->environment()))); m_ui->makeLabel->setText(tr("Override %1:").arg(QDir::toNativeSeparators(m_makeStep->makeCommand(bc->environment()))));
} }
void GenericMakeStepConfigWidget::updateDetails() void GenericMakeStepConfigWidget::updateDetails()
......
...@@ -400,7 +400,7 @@ void MakeStepConfigWidget::updateDetails() ...@@ -400,7 +400,7 @@ void MakeStepConfigWidget::updateDetails()
bc = qobject_cast<Qt4BuildConfiguration *>(m_makeStep->target()->activeBuildConfiguration()); bc = qobject_cast<Qt4BuildConfiguration *>(m_makeStep->target()->activeBuildConfiguration());
if (tc && bc) if (tc && bc)
m_ui->makeLabel->setText(tr("Override %1:").arg(tc->makeCommand(bc->environment()))); m_ui->makeLabel->setText(tr("Override %1:").arg(QDir::toNativeSeparators(tc->makeCommand(bc->environment()))));
else else
m_ui->makeLabel->setText(tr("Make:")); m_ui->makeLabel->setText(tr("Make:"));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment