diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-04-26 09:47:12 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-04-26 09:47:39 +0300 |
| commit | c10b4e842adaf096bf46ed5f98e236f3fee87870 (patch) | |
| tree | c91d66d8a9628d9af8bfe868ac8945173db098ab /basicsuite/qtwebbrowser | |
| parent | 0ea39397893edb54454bfceabde4b83fc5b60a2e (diff) | |
| parent | 34310ed69919f452dbcdae42f350254a40a06113 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
* origin/5.12:
34310ed Split demos.xml to individual xml files
7eea480 Doc: Bump version to 5.12.3
Conflicts:
doc/b2qt-demos.qdoc
doc/b2qt-demos.qdocconf
Change-Id: I25c43406d1940d7e7ebb0427f91a6638f4b7273d
Diffstat (limited to 'basicsuite/qtwebbrowser')
| -rw-r--r-- | basicsuite/qtwebbrowser/demo.xml | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/basicsuite/qtwebbrowser/demo.xml b/basicsuite/qtwebbrowser/demo.xml new file mode 100644 index 0000000..020afa7 --- /dev/null +++ b/basicsuite/qtwebbrowser/demo.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<application title="Web Browser" main="main.qml" icon="preview_l.jpg"> +<description> +This example demonstrates the use of Qt WebEngine with Qt Quick. + +Demo can be used to browse the internet (working network connection required) or run the offline web page demos. +</description> +</application> |