diff options
author | Eike Ziller <[email protected]> | 2017-11-21 13:28:55 +0100 |
---|---|---|
committer | Eike Ziller <[email protected]> | 2017-11-21 13:28:55 +0100 |
commit | 89f9f22035f5e3755fa075c8198feb54d0763e2f (patch) | |
tree | 27b28fb70a5a46c3064e3721d3ca51cdddf09bc2 /src/plugins/debugger/debuggerplugin.cpp | |
parent | cbc9b61f192e1e52de5ce5c61c2375b73b9e5a0a (diff) | |
parent | 194bde265c9c207052f1039c54cf9d6cb32703c8 (diff) |
Merge remote-tracking branch 'origin/4.5'
Conflicts:
src/plugins/clangcodemodel/clangutils.cpp
src/plugins/cpptools/clangcompileroptionsbuilder.cpp
src/plugins/cpptools/compileroptionsbuilder.cpp
Change-Id: I0728f08171103259407bbbb35f93b70c2f2e18d0
Diffstat (limited to 'src/plugins/debugger/debuggerplugin.cpp')
-rw-r--r-- | src/plugins/debugger/debuggerplugin.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index 6707e00b009..0a52fba2a65 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -2102,7 +2102,7 @@ void DebuggerPlugin::attachExternalApplication(RunControl *rc) ProcessHandle pid = rc->applicationProcessHandle(); RunConfiguration *runConfig = rc->runConfiguration(); auto runControl = new RunControl(runConfig, ProjectExplorer::Constants::DEBUG_RUN_MODE); - auto debugger = new DebuggerRunTool(runControl, guessKitFromAbis({rc->abi()})); + auto debugger = new DebuggerRunTool(runControl, guessKitFromAbis({rc->abi()}), false); debugger->setAttachPid(pid); debugger->setRunControlName(tr("Process %1").arg(pid.pid())); debugger->setStartMode(AttachExternal); |