summaryrefslogtreecommitdiffstats
path: root/examples/webenginewidgets/markdowneditor/resources
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Remove broken homepage link from markdowncss attributionLuca Di Sera2021-11-081-1/+0
| | | | | | | | | | | | | | | | | | | | | | QtWebEngine uses Keving Burke's markdowncss for two of his examples. An attribution file is provided for both uses, pointing to the homepage of markdowncss "https://kevinburke.bitbucket.io/markdowncss/". Nonetheless, the project is currently unmaintained and the homepage doesn't exist anymore, meaning that the link to it is broken. As there is not a reachable homepage anymore, the "Homepage" key for markdowncss attributions was removed from the attribution files. A link to the same page was changed to the link to the bitbucket repository, which is still reachable, in the documentation for the affected examples. Task-number: QTBUG-96127 Pick-to: 6.2 Change-Id: Idd6c163eebeb2a2292ae76a73289fda5faa12b0a Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Merge remote-tracking branch 'origin/5.11' into 5.12Michael Brüning2018-08-212-126/+252
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf configure.json examples/webenginewidgets/markdowneditor/resources/3rdparty/marked.js examples/webenginewidgets/markdowneditor/resources/3rdparty/qt_attribution.json examples/webenginewidgets/markdowneditor/resources/markdowneditor.qrc mkspecs/features/platform.prf src/3rdparty src/core/media_capture_devices_dispatcher.cpp src/core/net/url_request_context_getter_qt.cpp src/core/net/url_request_context_getter_qt.h src/core/web_contents_adapter.cpp Change-Id: I467133ba455b1f85f6bb61793794c31cb1094541
| * Update marked.js in examplesKai Koehne2018-07-126-13/+1521
| | | | | | | | | | | | | | | | | | Update marked.js in examples to version 0.4.0. Also use the non-minified version; this is required by some downstream users like Debian. Task-number: QTBUG-69273 Change-Id: Ic4fffc2db0a457e54595cd846efee305b97b2238 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | Update 3rd party code in markdown exampleKai Koehne2018-05-236-14/+1396
|/ | | | | | | | | | | Update to marked 0.3.19. Also include the un-minified version, so that the code can be read. [ChangeLog][Third-Party Code] Updated "Marked (WebEngine Markdown Editor example)" to version 0.3.19. Change-Id: Ie068d003ec6cfab27803332b4aa12095c6c8a457 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Remove qwebchannel.js from test and exampleMichal Klocek2018-05-173-432/+1
| | | | | | | | Use qwebchannel.js shipped with qtwebchannel. Change-Id: Iceead5131d22a6988bbb4e7a3cca1e9f21908e3e Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io> Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Properly document third party code in examplesKai Koehne2017-07-138-5/+75
| | | | | | | | | | | Move files from marked, markdown.css to a 3rdparty directory, and properly document them with a qt_attribution.json file. Finally, reference the (automatically generated) documentation in the respective examples documentation. Task-number: QTBUG-61706 Change-Id: I8fd3f894e6e81647bc4804df784b1e00b83d12d6 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Merge remote-tracking branch 'origin/5.6' into devLiang Qi2016-02-101-1/+1
|\ | | | | | | | | | | | | | | Conflicts: tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp tests/auto/widgets/widgets.pro Change-Id: Id9444359ed2e35d469331db96a355c9ea2d095d5
| * Prefix Markdown Editor example with "WebEngine"Kai Koehne2016-02-041-1/+1
| | | | | | | | | | | | | | | | | | | | Follow the example of the other examples, and always start with WebEngine. This makes also sure that Qt Creator attaches the 'webengine' tag to the example. Task-number: QTBUG-50582 Change-Id: If99ba9a23560abae61e4e2ef5a5b091b3c5473c2 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
| * Make all examples BSD licensedKai Koehne2016-01-221-22/+28
| | | | | | | | | | Change-Id: I98924e5f8754b7b2ed095abf00eb73fa26399b2d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Updated license headersJani Heikkinen2016-02-011-16/+33
|/ | | | | | | | | From Qt 5.7 -> examples are lisenced under BSD license, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new BSD header Change-Id: I12d6dd8ebeddf1c39e8aed5095fd224f5e0a455f Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Add 'markdowneditor' exampleKai Koehne2015-11-176-0/+732
This example shows the use of QWebEngineView in a hybrid application, and how one can leverage JavaScript libraries to provide functionality with minimal effort. QWebEngineView is used to preview a MarkDown document. The text is exposed to the view through QWebChannel. An off-the-self js library converts it to HTML. Change-Id: I24c38106da3ec18975c71c16f7f7a58e93142f9e Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-02 20:43:09 +0000