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