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

Merge remote-tracking branch 'origin/4.7'

Browse Source 
Change-Id: Ifb51ca9893549c478e99c9fc3ea6c32d5d5a28a2
This commit is contained in:
Eike Ziller
2018-09-07 14:39:42 +02:00
parent b68d943c92 1a64efd863
commit ac9f1f798c
82 changed files with 186 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/debugger/debuggerdialogs.cpp
View File

@@ -436,6 +436,11 @@ void StartApplicationDialog::run(bool attachRemote)
debugger->setServerStartScript(newParameters.serverStartScript); // Note: This requires inferior.
bool isLocal = !dev || (dev->type() == ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE);
if (isLocal) {
Environment inferiorEnvironment = Environment::systemEnvironment();
k->addToEnvironment(inferiorEnvironment);
debugger->setInferiorEnvironment(inferiorEnvironment);
}
if (!attachRemote)
debugger->setStartMode(isLocal ? StartExternal : StartRemoteProcess);