Merge "Add themed icons." into qt-r1-dev