Merge "String review follow-up" into qt-dev