forked from qt-creator/qt-creator
Conflicts: src/plugins/debugger/debuggerruncontrol.cpp src/plugins/projectexplorer/gcctoolchain.cpp Change-Id: Iaad0659293681cce4266fc3e4ba2a4f2068de911
Conflicts: src/plugins/debugger/debuggerruncontrol.cpp src/plugins/projectexplorer/gcctoolchain.cpp Change-Id: Iaad0659293681cce4266fc3e4ba2a4f2068de911