Merge pull request #7112 from spycrab/qt_macos_layout Qt/macOS: Make configuration layout consistent with other platforms