Re #6846. Fixing messed up ifdef.
Merge branch 'feature/6846_qtassistant_singleton' into develop