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

Merge remote-tracking branch 'origin/4.4'

Browse Source 
Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri
	src/libs/utils/utils-lib.pri
	src/plugins/clangcodemodel/clangbackendipcintegration.h
	src/shared/qbs

Change-Id: I240e89afc76d8f40ce69d66683014b603f714707
This commit is contained in:
Eike Ziller
2017-08-23 12:12:41 +02:00
parent f2d2a6c6ff 7ef365d756
commit ddd9e96afa
70 changed files with 495 additions and 707 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/debugger/debuggerplugin.cpp
View File

@@ -2119,6 +2119,7 @@ void DebuggerPlugin::attachExternalApplication(RunControl *rc)
rp.startMode = AttachExternal;
rp.closeMode = DetachAtClose;
rp.toolChainAbi = rc->abi();
rp.languages = CppLanguage;
if (RunConfiguration *runConfig = rc->runConfiguration()) {
auto runControl = new RunControl(runConfig, ProjectExplorer::Constants::DEBUG_RUN_MODE);
(void) new DebuggerRunTool(runControl, rp);