[automerger skipped] Merge "Resolve resource ID at runtime to stabilize tests" into qt-dev am: 288024db11 -s ours am: f8f32911db -s ours
am:c3de7735af-s ours am skip reason: change_id Ic44b31ed9acc48b9bcba7e1e70cc18a65bc0a8f6 with SHA1223fae9a7fis in history Change-Id: I71aad89463bf0c8a745f8b89f7bf9ef3dbe478ff
This commit is contained in: