forked from qt-creator/qt-creator
Conflicts: src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp src/plugins/remotelinux/killappstep.cpp Change-Id: Ife961ca4eb14271c48bd0dbc08e0a0a816935682
Conflicts: src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp src/plugins/remotelinux/killappstep.cpp Change-Id: Ife961ca4eb14271c48bd0dbc08e0a0a816935682