diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2019-05-28 17:59:34 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2019-05-28 17:59:40 +0200 |
| commit | 1f3c157ec6b8be5de1eb89295713c2980fb1a7aa (patch) | |
| tree | b85888d73518f6abc7bbde74ab71a27887682f9d /src/quick/items/qquicktextdocument.cpp | |
| parent | 44ca7e31ee9365a72cd17ecd335ec4d0161420a9 (diff) | |
| parent | 0f5c34f2c6b64bae3429706a6c4211334c689092 (diff) | |
Merge "Merge remote-tracking branch 'origin/dev' into wip/scenegraphng"wip/scenegraphng
Diffstat (limited to 'src/quick/items/qquicktextdocument.cpp')
| -rw-r--r-- | src/quick/items/qquicktextdocument.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/quick/items/qquicktextdocument.cpp b/src/quick/items/qquicktextdocument.cpp index 06ac5804c4..021bbca0f6 100644 --- a/src/quick/items/qquicktextdocument.cpp +++ b/src/quick/items/qquicktextdocument.cpp @@ -237,6 +237,14 @@ void QQuickTextDocumentWithImageResources::setText(const QString &text) #endif } +#if QT_CONFIG(textmarkdownreader) +void QQuickTextDocumentWithImageResources::setMarkdownText(const QString &text) +{ + clearResources(); + QTextDocument::setMarkdown(text); +} +#endif + QSet<QUrl> QQuickTextDocumentWithImageResources::errors; QT_END_NAMESPACE |