aboutsummaryrefslogtreecommitdiffstats
path: root/src/quickcontrols/macos/GroupBox.qml
Commit message (Collapse)AuthorAgeFilesLines
* Native style: remove setting font from QStyleRichard Moe Gustavsen2022-12-221-1/+1
| | | | | | | | | | | | | | | | | | This is a follow-up on 43eca45b06. Which font a control should use should follow normal font propagation. So setting a different font explicitly in every control is not ideal. The font is in practice the same for all controls anyway. This will also remove a warning that will be printed if the application assigns a custom background delegate to a Button. Fixes: QTBUG-98098 Change-Id: I4f9304b391b4b9e398882fc532cbff5b09f53aff Reviewed-by: Mitch Curtis <[email protected]>
* Fix warnings with native stylesMitch Curtis2022-12-221-0/+2
| | | | | | | | | | | | | | | | Amends e592a2ad31695695f0dd2069b17c6ab90ed1a739 to cover some cases that were missed. They were missed because I incorrectly assumed that the various test functions that I added in 0765c176e7b7ee73b1ac6d6efdabc93e4dec978f would catch warnings, forgetting that the fact that we set QT_QUICK_CONTROLS_IGNORE_CUSTOMIZATION_WARNINGS to 1 in tst_macos and tst_windows meant that we'd never get the warnings. Fixes: QTBUG-109438 Pick-to: 6.5 Change-Id: I527785a3adf3afb2a7ee4943300e87909f21562e Reviewed-by: Qt CI Bot <[email protected]> Reviewed-by: Richard Moe Gustavsen <[email protected]>
* Remove "2" from Qt Quick Controls directoriesMitch Curtis2022-12-011-0/+28
Qt Quick Controls 2 was named that way because it was a follow-up to Qt Quick Controls 1.x. Now that Qt Quick Controls 1 is no longer supported, we don't need to have "2" in the name. Work on this was already started for the documentation in 1abdfe5d5a052f2298b7bf657513dfa7e0c66a56. By doing this renaming a few weeks before feature freeze, it won't affect the release but still results in as little time possible spent manually fixing conflicts in cherry-picks from non-LTS releases as a result of the renaming. This patch does the following: - Renames directories. - Adapts CMakeLists.txt and other files to account for the new paths. A follow-up patch will handle documentation. It does not touch library names or other user-facing stuff, as that will have to be done in Qt 7. Task-number: QTBUG-95413 Change-Id: I170d8db19033ee71e495ff0c5c1a517a41ed7634 Reviewed-by: Mitch Curtis <[email protected]>