aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/quick/doc/src/qmltypereference.qdoc12
-rw-r--r--src/quick/items/qquicktext.cpp4
-rw-r--r--src/quick/items/qquicktextedit.cpp4
-rw-r--r--src/quick/items/qquicktextinput.cpp4
-rw-r--r--src/quick/util/qquickvaluetypes_p.h14
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,