diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2024-05-06 12:25:44 +0200 |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2024-05-08 18:04:02 +0200 |
| commit | a8c93149aa220b1158c803dac2f9cc0d15a23df5 (patch) | |
| tree | d00e0a45ff11ed1cc69849e4b9b4228f04ddc5a5 /src/quick/items/qquicktextedit.cpp | |
| parent | aac94b9cb6bbfe8e16c8282dcdaf11b36eea4d6e (diff) | |
Match QFont::ContextFontMerging with Qt Quick API
While we don't support all style strategy flags in
Qt Quick, we do support selected ones as bools.
QFont::ContextFontMerging is useful to be able to
set per Text element, so it should be exposed through
the QML APIs.
Task-number: QTBUG-121131
Change-Id: If28a065aefc4e2043e830e31356b8bd98f6d4cd8
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
Diffstat (limited to 'src/quick/items/qquicktextedit.cpp')
| -rw-r--r-- | src/quick/items/qquicktextedit.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/quick/items/qquicktextedit.cpp b/src/quick/items/qquicktextedit.cpp index 22bbd6e05b..02b34a6671 100644 --- a/src/quick/items/qquicktextedit.cpp +++ b/src/quick/items/qquicktextedit.cpp @@ -376,6 +376,13 @@ QString QQuickTextEdit::text() const */ /*! + \qmlproperty object QtQuick::TextEdit::font.contextFontMerging + \since 6.8 + + \include qquicktext.cpp qml-font-context-font-merging +*/ + +/*! \qmlproperty string QtQuick::TextEdit::text The text to display. If the text format is AutoText the text edit will |