Re #6907. Trying to squash F18 warning/erorr
Merge branch 'bugfix/6907_qtassistant_mac' into develop