More qt5 fixes (thanks taurus)