Merge "Visual changes to QS header" into qt-dev