more Qt 5 fixes