[automerger skipped] Merge "Add support for graphics.mapper@3.0" into qt-dev...
[automerger skipped] Merge "Add support for graphics.mapper@3.0" into qt-dev am: f182d3ae am: 8a092d90 -s ours
am: 0f430267 -s ours
am skip reason: change_id Iaa7a3f06956f9f81b3d4338bbf32fea282cdd511 with SHA1 0838494f is in history
Change-Id: I577849a026101754419ef5e60a0d0440e93e822e