diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-08-22 10:57:07 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-08-22 10:57:07 +0000 |
commit | 5cf502ff07123606aadbf1fc358493b9f06ea3f7 (patch) | |
tree | 6fecfbfafcaceaa791861a8c4d2c36cc0892b46d /examples/webenginewidgets/markdowneditor/doc/src/markdowneditor.qdoc | |
parent | 4f8e38f3b9da8c2d50674b0002d5186a4b073913 (diff) | |
parent | be18c1dcfa68328acdf11e0a534749d9a5d75f8b (diff) |
Merge "Merge remote-tracking branch 'origin/5.11' into 5.12" into refs/staging/5.12
Diffstat (limited to 'examples/webenginewidgets/markdowneditor/doc/src/markdowneditor.qdoc')
-rw-r--r-- | examples/webenginewidgets/markdowneditor/doc/src/markdowneditor.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/webenginewidgets/markdowneditor/doc/src/markdowneditor.qdoc b/examples/webenginewidgets/markdowneditor/doc/src/markdowneditor.qdoc index b06d4ee84..9ff8f0615 100644 --- a/examples/webenginewidgets/markdowneditor/doc/src/markdowneditor.qdoc +++ b/examples/webenginewidgets/markdowneditor/doc/src/markdowneditor.qdoc @@ -154,7 +154,7 @@ In the \e index.html, we load a custom stylesheet and two JavaScript libraries. \l{http://kevinburke.bitbucket.org/markdowncss/}{markdown.css} is a markdown-friendly stylesheet created by Kevin Burke. - \l{https://github.com/chjj/marked}{marked.min.js} is a markdown parser and + \l{https://github.com/chjj/marked}{marked.js} is a markdown parser and compiler designed for speed written by Christopher Jeffrey and \e qwebchannel.js is part of the \l{QWebChannel} module. |