There was already an patch, which tried to fix this mentioned in the issue linked above: https://codereview.qt-project.org/#change,47377 .

I will look at this later, if I have more time. (this replacing of a installation method dependedn string with another would not be a upstream acceptable fix)