[automerger skipped] Merge "Resolve resource ID at runtime to stabilize tests" into qt-dev
am: 288024db11 -s ours
am skip reason: change_id Ic44b31ed9acc48b9bcba7e1e70cc18a65bc0a8f6 with SHA1 5764173a9f is in history

Change-Id: Ie2fec5bdde1a7c3bf7fced8ca28bd30493cf3374
tree: 279460320122fe6fb9b7de7bbf592caea99e2cc1
  1. tests/