Pick-to: 6.8 Change-Id: Icb2ae16d8d6b9083c1118ef2489fa2a1d7db9bdf Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> (cherry picked from commit 52d3cb8904eb0582d163cb9d51a6e835c5b4fa68) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>