diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-10 10:19:28 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-10 10:19:28 +0100 |
| commit | d1f4409a2b1e0143be0d4fd734f3dd83255ea35c (patch) | |
| tree | 52daa990c1da2c2ce9656fe4065b73a848a57a5a /examples | |
| parent | 8e5ac243ac774209b77bec42eda2ec43f9c9b04a (diff) | |
| parent | 776442f2117c4b2d6dac75ab56b42bd82e2ce6d0 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp
tests/auto/widgets/widgets.pro
Change-Id: Id9444359ed2e35d469331db96a355c9ea2d095d5
Diffstat (limited to 'examples')
| -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 783f60e01..7909aaddd 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) |