Some fixes were needed after the tool chain type was changed from
QString to an enum.

Task-number: 259939