Merge "Simplifying duplicate resource definition" into qt-dev