Merge "Update mainline module versions string." into qt-dev