Merge "Fixes an issue where the wrong icons where ambient" into qt-r1-dev