Fixes #15685, where the right Qt5 dlls on Windows were not packaged because they were not found when relying on the PATH environment variable. Also some cleanup of code introduced in 8120e13f, but no longer needed with 678aaad1.