diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2016-04-22 10:07:45 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2016-05-26 10:00:21 +0000 |
commit | 9ca63fbd0b022bd48d112f4beb38712e41612fb5 (patch) | |
tree | 53520b7dbc4b70f9cda47dcbc9429fbb4b4c2479 /src/imports/controls/material/qquickmaterialstyle_p.h | |
parent | 44ac831c51d248b115e594ae930c3bb359df68a1 (diff) |
Introduce a 'System' theme to the styles.
Setting the theme to System chooses either the light or dark theme
based on the system theme colors. However, when reading the value of
the theme property, the value is never System, but the actual theme.
[ChangeLog][Controls][Material] Added Material.System theme enum value,
that can be used to let the Material style choose either the light or
dark theme based on the system theme colors.
[ChangeLog][Controls][Universal] Added Universal.System theme enum value,
that can be used to let the Universal style choose either the light or
dark theme based on the system theme colors.
Change-Id: Ibfc9f01953cb8322b64d59413cfbaef9d4bb28fd
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/controls/material/qquickmaterialstyle_p.h')
-rw-r--r-- | src/imports/controls/material/qquickmaterialstyle_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/imports/controls/material/qquickmaterialstyle_p.h b/src/imports/controls/material/qquickmaterialstyle_p.h index e7434d83..2686d14b 100644 --- a/src/imports/controls/material/qquickmaterialstyle_p.h +++ b/src/imports/controls/material/qquickmaterialstyle_p.h @@ -108,7 +108,8 @@ class QQuickMaterialStyle : public QQuickStyleAttached public: enum Theme { Light, - Dark + Dark, + System }; enum Color { |