Merge "Make test expectation match comment" into qt-dev