diff options
| author | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2017-09-02 10:27:41 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2017-09-02 10:27:41 +0200 |
| commit | 72f320a266d7f6e8055fdb57d0996363fcbc027a (patch) | |
| tree | aa4944c3d78267aa1d44b92605bbb0e475546d20 /src/quick/items/qquicktextedit.cpp | |
| parent | a85ff0f11cce53244085cab8d947325099015725 (diff) | |
| parent | e41b519cfa8c9932b88db35b2d72588a13f19e4d (diff) | |
Merge dev into 5.10
Change-Id: I4376b711fbf02ea978f5d347d34a4a6a0c95dab2
Diffstat (limited to 'src/quick/items/qquicktextedit.cpp')
| -rw-r--r-- | src/quick/items/qquicktextedit.cpp | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/src/quick/items/qquicktextedit.cpp b/src/quick/items/qquicktextedit.cpp index 6190448479..da11913bde 100644 --- a/src/quick/items/qquicktextedit.cpp +++ b/src/quick/items/qquicktextedit.cpp @@ -368,6 +368,23 @@ QString QQuickTextEdit::text() const */ /*! + \qmlproperty bool QtQuick::TextEdit::font.preferShaping + \since 5.10 + + Sometimes, a font will apply complex rules to a set of characters in order to + display them correctly. In some writing systems, such as Brahmic scripts, this is + required in order for the text to be legible, but in e.g. Latin script, it is merely + a cosmetic feature. Setting the \c preferShaping property to false will disable all + such features when they are not required, which will improve performance in most cases. + + The default value is true. + + \qml + TextEdit { text: "Some text"; font.preferShaping: false } + \endqml +*/ + +/*! \qmlproperty string QtQuick::TextEdit::text The text to display. If the text format is AutoText the text edit will |