Merge "Add support for graphics.mapper@3.0" into qt-dev