qt/qtwebengine.git - Qt WebEngine

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'origin/5.6' into 5.7	Liang Qi	2016-03-21	3	-10/+20
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/3rdparty src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc Change-Id: I90728e965399e51b626d538924de955f9abab5fe
\| *	Make MarkDownEditor example more usable	Kai Koehne	2016-03-18	3	-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 dev	Liang Qi	2016-02-10	2	-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 Koehne	2016-02-04	2	-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 licensed	Kai Koehne	2016-01-22	8	-245/+237
\| \| \| \| \| \| \| \| \| \|	Change-Id: I98924e5f8754b7b2ed095abf00eb73fa26399b2d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* \|	Unify license header usage	Jani Heikkinen	2016-02-01	1	-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 headers	Jani Heikkinen	2016-02-01	8	-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 example	Joerg Bornemann	2016-01-14	1	-0/+2
\| \| \| \| \|	Change-Id: Iff50511b06962d02e2a69ee47f1f0df82425dc2d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
*	Add 'markdowneditor' example	Kai Koehne	2015-11-17	18	-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>