Merge "Adding a level of indirection." into qt-dev