qtbase: Consolidate qtbase build fix patch

Make one patch and rebase for the dev branch.