Merge branch 'revert-findqt4-dirs-fix' into release-3.11

Merge-request: !1867