Task-number: QTBUG-115158 Pick-to: 6.7 6.5 6.2 5.15 Change-Id: I7465a19f6003cfae7507d798fadeab22bf1b118d Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit 01acb888e0f9f06cac07d69d8c934eac9d32daf3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>