qt5-static: Reworked patches since gerrit comments

Ossi had a few suggestions on my first round of patches
and this patchset includes his suggestions. I didn't remove
win32-g-Fix-system-qtAddEnvTool-under-MSYS-configure.patch
but according to Ossi it is not needed.

(I will delete the old patches after testing the new ones.)