Pick-to: 6.8 Change-Id: I8407ddb117941bc9e28b18998ff1e824ded2b1d9 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 38e39902c6b2056d4600c2f8b425fde26cca179c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>