Merge "Fixed the incorrect function signature" into qt-dev