Merge "Fix colors in QS Header" into qt-dev