Merge "String update." into qt-r1-dev