diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-13 01:03:07 +0100 |
|---|---|---|
| committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-02-13 13:09:47 +0100 |
| commit | d5a5e9dcd594e2d2f3dbb05fdb0baf56cc50774d (patch) | |
| tree | 4c6979394422c97dc21bc8b6e7852e1998eafb25 /src/quick/doc | |
| parent | 229e3220ef521dd4389808fd311ea5ae33ab0cae (diff) | |
| parent | ac0ce38dcfeeded87db0c1dd5d348f5ed6fc1af3 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
src/qml/jsruntime/qv4engine.cpp
Change-Id: I61f41672e2dfe7e542ca30fed5f173d0a9ee3412
Diffstat (limited to 'src/quick/doc')
| -rw-r--r-- | src/quick/doc/src/qmltypereference.qdoc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/quick/doc/src/qmltypereference.qdoc b/src/quick/doc/src/qmltypereference.qdoc index 418475f100..528444cad3 100644 --- a/src/quick/doc/src/qmltypereference.qdoc +++ b/src/quick/doc/src/qmltypereference.qdoc @@ -179,6 +179,7 @@ available when you import \c QtQuick. \li \l bool \c font.kerning \li \l bool \c font.preferShaping \li \l enumeration \c font.hintingPreference + \li \l string \c font.styleName \endlist Example: |