Merge "Remove todo comment" into qt-dev