diff options
| author | Shawn Rutledge <shawn.rutledge@digia.com> | 2015-05-11 11:34:08 +0200 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@digia.com> | 2015-05-11 15:07:42 +0000 |
| commit | 0f61aa5efe1c12337f3ab753c08e70d6eaf6c2ab (patch) | |
| tree | 6c7b2aa71ccd4a6f3410a88dea1c1cc75fbeca04 /src/quick/items/qquicktext.cpp | |
| parent | 35bb082b2522262261858b685b7ebeb8c79cc189 (diff) | |
Add QtQuick::Text::font.weight enum values
Followup to 517da68893be9e6d97c7993922c573de9560604d in qtbase:
make all possible font weights available in QML.
Task-number: QTBUG-38482
Change-Id: I4f821d2fadbcd42fbb237903be474d67a0a5a7c9
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
Diffstat (limited to 'src/quick/items/qquicktext.cpp')
| -rw-r--r-- | src/quick/items/qquicktext.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp index 456ec25edd..dd4f57bfdb 100644 --- a/src/quick/items/qquicktext.cpp +++ b/src/quick/items/qquicktext.cpp @@ -1372,10 +1372,14 @@ QQuickText::~QQuickText() The weight can be one of: \list + \li Font.Thin \li Font.Light + \li Font.ExtraLight \li Font.Normal - the default + \li Font.Medium \li Font.DemiBold \li Font.Bold + \li Font.ExtraBold \li Font.Black \endlist |