Fixes in qt7

[lygstate]

No description provided.

[jonaski]

Qt doesn't use GitHub, this needs to be submitted to Gerrit codereview (https://codereview.qt-project.org/). For instructions see: https://wiki.qt.io/Setting_up_Gerrit and https://wiki.qt.io/Gerrit_Introduction

[cla-assistant]

Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you sign our Contributor License Agreement before we can accept your contribution.
_{You have signed the CLA already but the status is still pending? Let us recheck it.}