aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMitch Curtis <mitch.curtis@qt.io>2017-12-11 12:24:20 +0100
committerJ-P Nurmi <jpnurmi@qt.io>2017-12-11 15:27:31 +0000
commit43719398070b799c54e095724691bb5a9339cefa (patch)
treef26e63a3d27b07e6a3ec233958b79636327dde8a
parent3d3173ac3cb4ee51dfd9d46456bbe9ebf0976022 (diff)
Doc: mention qtquickcontrols2.conf file in font docs
Currently, there's no explicit mention of being able to customize the font via the qtquickcontrols2.conf file. Change-Id: I0c62e19b721a2d652021c303f876aaaa1098b880 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
-rw-r--r--src/quicktemplates2/qquickcontrol.cpp14
1 files changed, 11 insertions, 3 deletions
diff --git a/src/quicktemplates2/qquickcontrol.cpp b/src/quicktemplates2/qquickcontrol.cpp
index 4a3cab81..1db8932b 100644
--- a/src/quicktemplates2/qquickcontrol.cpp
+++ b/src/quicktemplates2/qquickcontrol.cpp
@@ -724,9 +724,14 @@ void QQuickControl::itemChange(QQuickItem::ItemChange change, const QQuickItem::
The default font depends on the system environment. ApplicationWindow maintains a system/theme
font which serves as a default for all controls. There may also be special font defaults for
- certain types of controls. You can also set the default font for controls by passing a custom
- font to QGuiApplication::setFont(), before loading the QML. Finally, the font is matched
- against Qt's font database to find the best match.
+ certain types of controls. You can also set the default font for controls by either:
+
+ \list
+ \li passing a custom font to QGuiApplication::setFont(), before loading the QML; or
+ \li specifying the fonts in the \l {Qt Quick Controls 2 Configuration File}{qtquickcontrols2.conf file}.
+ \endlist
+
+ Finally, the font is matched against Qt's font database to find the best match.
Control propagates explicit font properties from parent to children. If you change a specific
property on a control's font, that property propagates to all of the control's children,
@@ -747,6 +752,9 @@ void QQuickControl::itemChange(QQuickItem::ItemChange change, const QQuickItem::
}
}
\endcode
+
+ For the full list of available font properties, see the
+ \l [QtQuick]{font}{font QML Basic Type} documentation.
*/
QFont QQuickControl::font() const
{