diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-02-08 17:20:19 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-02-08 17:20:34 +0100 |
| commit | 776442f2117c4b2d6dac75ab56b42bd82e2ce6d0 (patch) | |
| tree | 8b1730f28cb700e58bf254c440c4167991b94fe3 /examples/webenginewidgets | |
| parent | 82f4d13a13b40d9cb7710f6dd4190175a272a394 (diff) | |
| parent | 489c9d0f631f79057bb16994b6719395d97f80ab (diff) | |
Merge remote-tracking branch 'origin/5.6.0' into 5.6
Change-Id: I98705a1bb82917147f36a89761eedfc755a45bc5
Diffstat (limited to 'examples/webenginewidgets')
| -rw-r--r-- | examples/webenginewidgets/markdowneditor/doc/src/markdowneditor.qdoc | 2 | ||||
| -rw-r--r-- | examples/webenginewidgets/markdowneditor/resources/default.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/examples/webenginewidgets/markdowneditor/doc/src/markdowneditor.qdoc b/examples/webenginewidgets/markdowneditor/doc/src/markdowneditor.qdoc index 44b1246b3..ddea067b7 100644 --- a/examples/webenginewidgets/markdowneditor/doc/src/markdowneditor.qdoc +++ b/examples/webenginewidgets/markdowneditor/doc/src/markdowneditor.qdoc @@ -27,7 +27,7 @@ /*! \example webenginewidgets/markdowneditor - \title Markdown Editor Example + \title WebEngine Markdown Editor Example \ingroup webengine-widgetexamples \brief Demonstrates how to integrate a web engine in a hybrid desktop application. diff --git a/examples/webenginewidgets/markdowneditor/resources/default.md b/examples/webenginewidgets/markdowneditor/resources/default.md index e5905b101..8f9c807aa 100644 --- a/examples/webenginewidgets/markdowneditor/resources/default.md +++ b/examples/webenginewidgets/markdowneditor/resources/default.md @@ -1,4 +1,4 @@ -## Markdown Editor Example +## WebEngine Markdown Editor Example This example uses [QWebEngineView](http://doc.qt.io/qt-5/qwebengineview.html) to preview text written using the [Markdown](https://en.wikipedia.org/wiki/Markdown) |