Pull in an upstream commit to fix the build with the upcoming Qt 5.5.1.

Contrary to what the upstream commit message says, this is also required on
FreeBSD 10.