Upstream fixes for Qt5 landed by now.