qtchooser: Rebase patches