OSDN Git Service

Fix make not found in environment
authorDaniel Teske <daniel.teske@nokia.com>
Thu, 20 Oct 2011 14:39:59 +0000 (14:39 +0000)
committerDaniel Teske <daniel.teske@nokia.com>
Thu, 20 Oct 2011 12:51:02 +0000 (14:51 +0200)
Change-Id: I5bfbe8cf36556cceec02011012d2d1c09d0c0ebc
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
src/plugins/qt4projectmanager/makestep.cpp

index 9a2cabd..9a7a494 100644 (file)
@@ -346,11 +346,6 @@ void MakeStepConfigWidget::updateDetails()
     if (!m_makeStep->m_makeCmd.isEmpty())
         makeCmd = m_makeStep->m_makeCmd;
     param.setCommand(makeCmd);
-    if (param.commandMissing()) {
-        m_summaryText = tr("<b>Make:</b> %1 not found in the environment.").arg(makeCmd);
-        emit updateSummary();
-        return;
-    }
 
     QString args = m_makeStep->userArguments();
     if (!m_makeStep->isClean()) {
@@ -377,6 +372,9 @@ void MakeStepConfigWidget::updateDetails()
     param.setArguments(args);
     param.setEnvironment(env);
     m_summaryText = param.summaryInWorkdir(displayName());
+
+    if (param.commandMissing())
+        m_summaryText = tr("<b>Make:</b> %1 not found in the environment.").arg(makeCmd); // Override display text
     emit updateSummary();
 }