Backport upstream patch to fix build with Qt 5.15

Closes: #972158.

Merge request reports

Loading