Rebase the previous patch for current Qt

Authored by jgrulich on May 28 2020, 12:49 PM.

Description

Rebase the previous patch for current Qt

I didn't realize the code is different in upstream a bit and it won't apply

Details