From b9c64a392ac2a693377eea92b82878b694cf9ae0 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@digia.com>
Date: Mon, 9 Sep 2013 14:20:39 +0200
Subject: [PATCH] Fix slashes of displayed make commands.

Change-Id: Ic35966fd86c40ba0b02d48f7bf0e19ab30779c97
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
---
 src/plugins/genericprojectmanager/genericmakestep.cpp | 4 +++-
 src/plugins/qt4projectmanager/makestep.cpp            | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/plugins/genericprojectmanager/genericmakestep.cpp b/src/plugins/genericprojectmanager/genericmakestep.cpp
index 4fcce35c1d4..d2f0c580765 100644
--- a/src/plugins/genericprojectmanager/genericmakestep.cpp
+++ b/src/plugins/genericprojectmanager/genericmakestep.cpp
@@ -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()
diff --git a/src/plugins/qt4projectmanager/makestep.cpp b/src/plugins/qt4projectmanager/makestep.cpp
index c0b0fb81d04..bd1bfe3b49f 100644
--- a/src/plugins/qt4projectmanager/makestep.cpp
+++ b/src/plugins/qt4projectmanager/makestep.cpp
@@ -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:"));