Futher changes for qt versions