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

Fix slashes of displayed make commands.

Browse Source 
Change-Id: Ic35966fd86c40ba0b02d48f7bf0e19ab30779c97
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Friedemann Kleint
2013-09-09 14:20:39 +02:00
parent a22e2caadf
commit b9c64a392a
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/genericprojectmanager/genericmakestep.cpp
View File

@@ -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()
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()

2
src/plugins/qt4projectmanager/makestep.cpp
View File

@@ -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:"));