Merge "String change" into qt-dev