Merge branch 'master' into qt-5.12.5-update-submodules
authorMichael Schuster <48932272+misch7@users.noreply.github.com>
Sat, 19 Oct 2019 03:43:23 +0000 (05:43 +0200)
committerGitHub <noreply@github.com>
Sat, 19 Oct 2019 03:43:23 +0000 (05:43 +0200)

Trivial merge