Qt buildfixes

sent as pull request now to save me from merge-conflict-headaches later