From 233f65da57f9aeefe8ef573261ddd4f685d10149 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@nokia.com>
Date: Thu, 14 Apr 2011 17:29:34 +0200
Subject: [PATCH] GCCE: Use make.exe on windows

Use make.exe (not make) on windows to match what RVCT does. This is
a cosmetic change to stop percieved flickering when switching between
RVCT and GCCE tool chains.
---
 src/plugins/qt4projectmanager/qt-s60/gccetoolchain.cpp | 9 +++++++++
 src/plugins/qt4projectmanager/qt-s60/gccetoolchain.h   | 1 +
 2 files changed, 10 insertions(+)

diff --git a/src/plugins/qt4projectmanager/qt-s60/gccetoolchain.cpp b/src/plugins/qt4projectmanager/qt-s60/gccetoolchain.cpp
index 1a17dcd9259..176957951e0 100644
--- a/src/plugins/qt4projectmanager/qt-s60/gccetoolchain.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/gccetoolchain.cpp
@@ -117,6 +117,15 @@ void GcceToolChain::addToEnvironment(Utils::Environment &env) const
     env.set(QLatin1String("LANG"), QString(QLatin1Char('C')));
 }
 
+QString GcceToolChain::makeCommand() const
+{
+#if defined(Q_OS_WIN)
+    return QLatin1String("make.exe");
+#else
+    return QLatin1String("make");
+#endif
+}
+
 QString GcceToolChain::defaultMakeTarget() const
 {
     return QLatin1String("gcce");
diff --git a/src/plugins/qt4projectmanager/qt-s60/gccetoolchain.h b/src/plugins/qt4projectmanager/qt-s60/gccetoolchain.h
index 3df3c81da32..d7a6995284c 100644
--- a/src/plugins/qt4projectmanager/qt-s60/gccetoolchain.h
+++ b/src/plugins/qt4projectmanager/qt-s60/gccetoolchain.h
@@ -49,6 +49,7 @@ public:
 
     QByteArray predefinedMacros() const;
     void addToEnvironment(Utils::Environment &env) const;
+    QString makeCommand() const;
     QString defaultMakeTarget() const;
 
     ProjectExplorer::ToolChain *clone() const;