Merge "Fix atoi build errors" into qt-dev