Conflicts: qbs/modules/qtc/qtc.qbs qtcreator.pri Change-Id: Ic1ab71d0d40fa6c90e337c8ee9d9558e8f103eaa