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 | |
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>
-rw-r--r-- | src/quick/doc/src/qmltypereference.qdoc | 12 | ||||
-rw-r--r-- | src/quick/items/qquicktext.cpp | 4 | ||||
-rw-r--r-- | src/quick/items/qquicktextedit.cpp | 4 | ||||
-rw-r--r-- | src/quick/items/qquicktextinput.cpp | 4 | ||||
-rw-r--r-- | src/quick/util/qquickvaluetypes_p.h | 14 |
5 files changed, 33 insertions, 5 deletions
diff --git a/src/quick/doc/src/qmltypereference.qdoc b/src/quick/doc/src/qmltypereference.qdoc index 0dbc342baa..e3641f2d76 100644 --- a/src/quick/doc/src/qmltypereference.qdoc +++ b/src/quick/doc/src/qmltypereference.qdoc @@ -185,18 +185,30 @@ available when you import \c QtQuick. \table \row + \li \c Font.Thin + \li 0 + \row + \li \c Font.ExtraLight + \li 12 + \row \li \c Font.Light \li 25 \row \li \c Font.Normal \li 50 \row + \li \c Font.Medium + \li 57 + \row \li \c Font.DemiBold \li 63 \row \li \c Font.Bold \li 75 \row + \li \c Font.ExtraBold + \li 81 + \row \li \c Font.Black \li 87 \endtable 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 diff --git a/src/quick/items/qquicktextedit.cpp b/src/quick/items/qquicktextedit.cpp index c3315878f2..2f2fc0d4c1 100644 --- a/src/quick/items/qquicktextedit.cpp +++ b/src/quick/items/qquicktextedit.cpp @@ -211,10 +211,14 @@ QString QQuickTextEdit::text() const 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 diff --git a/src/quick/items/qquicktextinput.cpp b/src/quick/items/qquicktextinput.cpp index 5c8c0cf823..54da9a40d0 100644 --- a/src/quick/items/qquicktextinput.cpp +++ b/src/quick/items/qquicktextinput.cpp @@ -234,10 +234,14 @@ QString QQuickTextInputPrivate::realText() const 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 diff --git a/src/quick/util/qquickvaluetypes_p.h b/src/quick/util/qquickvaluetypes_p.h index 75ed2bce01..f62306ed01 100644 --- a/src/quick/util/qquickvaluetypes_p.h +++ b/src/quick/util/qquickvaluetypes_p.h @@ -283,11 +283,15 @@ class QQuickFontValueType Q_PROPERTY(qreal wordSpacing READ wordSpacing WRITE setWordSpacing FINAL) public: - enum FontWeight { Light = QFont::Light, - Normal = QFont::Normal, - DemiBold = QFont::DemiBold, - Bold = QFont::Bold, - Black = QFont::Black }; + enum FontWeight { Thin = QFont::Thin, + ExtraLight = QFont::ExtraLight, + Light = QFont::Light, + Normal = QFont::Normal, + Medium = QFont::Medium, + DemiBold = QFont::DemiBold, + Bold = QFont::Bold, + ExtraBold = QFont::ExtraBold, + Black = QFont::Black }; enum Capitalization { MixedCase = QFont::MixedCase, AllUppercase = QFont::AllUppercase, AllLowercase = QFont::AllLowercase, |