Merge "Fix string comment" into qt-dev