diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-07-11 14:51:40 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-07-11 17:24:39 +0200 |
| commit | 13374ceb165c44658aa97890c37b206859c9a31c (patch) | |
| tree | 562362b196a459ee3449a5a1e60e5216a9dd6984 /src/quick/items/qquicktextedit_p.h | |
| parent | ae47deba4c943c496412530a8d2a5a688ae12038 (diff) | |
| parent | b5d18be5a03406d0aac83856dd41e1525fd14a28 (diff) | |
Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake
Change-Id: I2963c1209316fb6755f572969f368970450d7991
Diffstat (limited to 'src/quick/items/qquicktextedit_p.h')
| -rw-r--r-- | src/quick/items/qquicktextedit_p.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/quick/items/qquicktextedit_p.h b/src/quick/items/qquicktextedit_p.h index 259a614d6b..2d1b6c7f9c 100644 --- a/src/quick/items/qquicktextedit_p.h +++ b/src/quick/items/qquicktextedit_p.h @@ -134,7 +134,8 @@ public: enum TextFormat { PlainText = Qt::PlainText, RichText = Qt::RichText, - AutoText = Qt::AutoText + AutoText = Qt::AutoText, + MarkdownText = Qt::MarkdownText }; Q_ENUM(TextFormat) @@ -375,6 +376,7 @@ private Q_SLOTS: void invalidateBlock(const QTextBlock &block); void updateCursor(); void q_linkHovered(const QString &link); + void q_markerHovered(bool hovered); void q_updateAlignment(); void updateSize(); void triggerPreprocess(); |