[automerger skipped] Merge "fixes a security vulnerability in slice provider" into qt-dev am: bc59740fe4 am: e3f595c0a4
am:5ab3c0d462-s ours am skip reason: change_id Ib1b4fba54ebd3599fe11021d21dc9b09d34e8965 with SHA1a6364d92edis in history Change-Id: I7514e3c8b79870310914f05fb115a87ca0afad01
This commit is contained in: