Re #6846. Trying to fix the windoze builds.
Merge branch 'feature/6846_qtassistant_singleton' into develop