Merge "Adds annotations in response to API feedback." into qt-dev