Re #6630. Trying to fix osx build error.
Merge branch 'feature/6630_launch_qtassistant' into develop