-
Eike Ziller authored
Conflicts: qtcreator.pri qtcreator.pro src/plugins/qtsupport/debugginghelperbuildtask.h Change-Id: I6e013efa40ee4d5addcc76d6ff13e7f4fa98cc1d
8f9861cd
Conflicts: qtcreator.pri qtcreator.pro src/plugins/qtsupport/debugginghelperbuildtask.h Change-Id: I6e013efa40ee4d5addcc76d6ff13e7f4fa98cc1d