diff options
| author | Richard Moe Gustavsen <richard.gustavsen@qt.io> | 2020-08-19 14:44:17 +0200 |
|---|---|---|
| committer | Richard Moe Gustavsen <richard.gustavsen@qt.io> | 2020-08-26 16:37:43 +0200 |
| commit | ed813c19fa422cd0858dda25a3c401e428fd6e0b (patch) | |
| tree | 7296f82cede7315b8112c7fb6ded7ddfb7abce59 /examples/widgets/doc | |
| parent | 9efe2a8603cd9023bfebb96a3a7ca4a65002669d (diff) | |
| download | qtbase-ed813c19fa422cd0858dda25a3c401e428fd6e0b.tar.gz | |
macOS: rename 'macintosh' style to 'macos'
Change the name/key of the style to 'macos'. Besides the
name 'macintosh' being archaic, we also need this
change to avoid creating 'macintosh' style folders
in QtQuickControls, now that we plan to use QPlatformTheme
also there to resolve the style.
[ChangeLog][Widgets][QStyle] The 'macintosh' style
has been renamed to 'macos'.
Change-Id: I14b8a8b4dbd369e7a7d16b94e4ad27e501e7e8d0
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'examples/widgets/doc')
| -rw-r--r-- | examples/widgets/doc/src/icons.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/widgets/doc/src/icons.qdoc b/examples/widgets/doc/src/icons.qdoc index 36d79a3f05..5dca44a887 100644 --- a/examples/widgets/doc/src/icons.qdoc +++ b/examples/widgets/doc/src/icons.qdoc @@ -631,7 +631,7 @@ currently available GUI styles using QStyleFactory. QStyleFactory::keys() returns a list of valid keys, typically including "windows" and "fusion". Depending on the platform, - "windowsvista" and "macintosh" may be available. + "windowsvista" and "macos" may be available. We create one action for each key, and adds the action to the action group. Also, for each action, we call QAction::setData() @@ -666,7 +666,7 @@ For each action, we first extract the style name using QAction::data(). Since this is only a QStyleFactory key (e.g., - "macintosh"), we cannot compare it directly to the current + "macos"), we cannot compare it directly to the current style's class name. We need to create a QStyle object using the static QStyleFactory::create() function and compare the class name of the created QStyle object with that of the current style. |