Comment 37 for bug 1528886

I replaced the former patch with the fix2, ~test3 is building in silo 032 with that included.

The only minor changes to the patch: fixing paths, removing the removed "qDebug()" line from the last hunk since it's not in the original code.