From ca0a8a6cf76ba292cfcaf8e70e6534f27e2e92c4 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@qt.io>
Date: Thu, 5 Jan 2017 12:44:14 +0100
Subject: [PATCH] Qmake: Initialize ExtraRunConfigurationAspects after initial
 parsing

Task-number: QTCREATORBUG-17462
Task-number: QTCREATORBUG-17477
Change-Id: Ie74455362d7e7ddc0cbd9296a3e2438e7195b00b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: hjk <hjk@qt.io>
---
 .../qmakeprojectmanager/desktopqmakerunconfiguration.cpp    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp b/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp
index 3c6e6bd828b..faf7bba9618 100644
--- a/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp
+++ b/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp
@@ -136,6 +136,12 @@ void DesktopQmakeRunConfiguration::proFileUpdated(QmakeProFileNode *pro, bool su
         emit effectiveTargetInformationChanged();
         setDefaultDisplayName(defaultDisplayName());
         extraAspect<LocalEnvironmentAspect>()->buildEnvironmentHasChanged();
+
+        extraAspect<WorkingDirectoryAspect>()
+                ->setDefaultWorkingDirectory(FileName::fromString(baseWorkingDirectory()));
+        auto terminalAspect = extraAspect<TerminalAspect>();
+        if (!terminalAspect->isUserSet())
+            terminalAspect->setUseTerminal(isConsoleApplication());
     }
 }