Re #6630. More stuff to make osx happy.
Merge branch 'feature/6630_launch_qtassistant' into develop