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

Merge remote-tracking branch 'origin/4.1'

Browse Source 
Change-Id: I80f96f100046625f24b6ab5d13fdb05660365abc
This commit is contained in:
Eike Ziller
2016-08-22 16:30:49 +02:00
parent f41b48ef5d e87da5a08a
commit 841778ed69
19 changed files with 78 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/debugger/debuggerruncontrol.cpp
View File

@@ -373,6 +373,10 @@ static DebuggerRunControl *doCreate(DebuggerRunParameters rp, RunConfiguration *
rp.projectSourceDirectory = project->projectDirectory().toString();
rp.projectSourceFiles = project->files(Project::SourceFiles);
}
} else {
// "special" starts like Start and Debug External Application.
rp.inferior.environment = Environment::systemEnvironment();
rp.inferior.environment.modify(EnvironmentKitInformation::environmentChanges(kit));
}
rp.toolChainAbi = ToolChainKitInformation::targetAbi(kit);