forked from qt-creator/qt-creator
Fix slashes of displayed make commands.
Change-Id: Ic35966fd86c40ba0b02d48f7bf0e19ab30779c97 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
@@ -47,6 +47,8 @@
|
||||
#include <utils/qtcassert.h>
|
||||
#include <utils/qtcprocess.h>
|
||||
|
||||
#include <QDir>
|
||||
|
||||
using namespace Core;
|
||||
using namespace ProjectExplorer;
|
||||
|
||||
@@ -290,7 +292,7 @@ void GenericMakeStepConfigWidget::updateMakeOverrrideLabel()
|
||||
if (!bc)
|
||||
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()
|
||||
|
||||
@@ -400,7 +400,7 @@ void MakeStepConfigWidget::updateDetails()
|
||||
bc = qobject_cast<Qt4BuildConfiguration *>(m_makeStep->target()->activeBuildConfiguration());
|
||||
|
||||
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
|
||||
m_ui->makeLabel->setText(tr("Make:"));
|
||||
|
||||
|
||||
Reference in New Issue
Block a user