summaryrefslogtreecommitdiffstats
path: root/examples/webenginewidgets/markdowneditor
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Prevent Qt Quick Compiler from removing qrc Javascript source codeAlexandru Croitor2018-02-201-0/+4
| | | | | | | | | | | | | | | | | By default whenever a Qt application is built with Qt Quick compiler, it will scan all qrc resources for javascript files, generate corresponding C++ code, and remove the original JS code. This is problematic for web pages that are loaded in WebEngine because the pages won't be able to access the javascript code, and silently fail (or if you are lucky, you will get some unrelated "can not be found" error). Use the undocumented QtQuick Compiler QTQUICK_COMPILER_SKIPPED_RESOURCES qmake variable to specify that Javascript source code found in qrc files should be left as is. Task-number: QTBUG-66155 Change-Id: Ib1dc744901baddd9e0c17c53db1ffede5c31e544 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Fix license header for examplesKai Koehne2017-09-207-7/+7
| | | | | | Task-number: QTBUG-60006 Change-Id: Ie1604aed3d5a9ba566e898eae232227ba340bfaa Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Properly document third party code in examplesKai Koehne2017-07-1310-11/+72
| | | | | | | | | | | 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>
* Fix some minor issues in example docsJüri Valdmann2017-06-131-1/+1
| | | | | | | Task-number: QTBUG-60655 Change-Id: Ie385232d5c126eafc18c08f49c15cc5e18c69ba1 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* markdown: Code beautificationKai Koehne2017-05-032-2/+2
| | | | | Change-Id: I74d30578a9725f10a8d4e86ff8740d5f467d0fbc Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* MarkDownEditor: Hide context menuKai Koehne2016-10-042-2/+8
| | | | | | | | Most actions do not make sense. A custom context menu might be good for text actions, but would require reimplementing QWebEngineView. Change-Id: Idf94939c16469e1dcee96d9ecfd0eb5309589fdd Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Merge remote-tracking branch 'origin/5.6' into 5.7Allan Sandfeld Jensen2016-06-271-0/+1
|\ | | | | | | Change-Id: Ic6686df8f82f710a3441501b7eeaffe69fbcbdf7
| * Make all examples high-dpi awareKai Koehne2016-06-201-0/+1
| | | | | | | | | | | | | | | | | | Setting the Qt::AA_EnableHighDpiScaling attribute makes sure that the scrollbars are scaled, and that the default zoom level is sensible. Task-number: QTBUG-54113 Change-Id: I0ae7eb97cb9e2824e7f9b92d77cf2986cac66685 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-03-213-10/+20
|\| | | | | | | | | | | | | | | Conflicts: src/3rdparty src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc Change-Id: I90728e965399e51b626d538924de955f9abab5fe
| * Make MarkDownEditor example more usableKai Koehne2016-03-183-10/+20
| | | | | | | | | | | | | | | | - Use a fixed width font for the editor. - Accept .md file as command line argument. Change-Id: I97e3bb930569240e195ecc21ed4ce3d9acd3ff66 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2016-02-102-2/+2
|\| | | | | | | | | | | | | | | 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-042-2/+2
| | | | | | | | | | | | | | | | | | | | 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-228-245/+237
| | | | | | | | | | Change-Id: I98924e5f8754b7b2ed095abf00eb73fa26399b2d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Unify license header usageJani Heikkinen2016-02-011-5/+5
| | | | | | | | | | | | | | | | Update old header.FDL to new header.FDL Change-Id: Iee63498bee1b150b5d079b9a1e82c40bacd4b494 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Updated license headersJani Heikkinen2016-02-018-183/+263
|/ | | | | | | | | 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>
* Fix namespaced build of markdowneditor exampleJoerg Bornemann2016-01-141-0/+2
| | | | | Change-Id: Iff50511b06962d02e2a69ee47f1f0df82425dc2d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Add 'markdowneditor' exampleKai Koehne2015-11-1718-0/+1593
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>