Pick-to: 6.8 6.5 Fixes: QTBUG-134788 Change-Id: I118d15df4e644dbed1a3de5efdb0b5d5a0e11c20 Reviewed-by: Andreas Eliasson <andreas.eliasson@qt.io> (cherry picked from commit 7018db691688bf4500e8398e9ad7b5a9a8ff3779) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>