diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-21 18:09:08 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-21 18:09:08 +0100 |
| commit | b1153753221513aa5687001c84a1c9ed69925dc6 (patch) | |
| tree | 3569ad54e433fee8244effe558ca52e567b6890d /examples/webenginewidgets/simplebrowser/data/simplebrowser.qrc | |
| parent | 4d6b2dc88bda15ade9d04e54d80b7e4693d59832 (diff) | |
| parent | c2687689ba42d6021ae3f220d9fd240609489d3a (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/3rdparty
src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc
Change-Id: I90728e965399e51b626d538924de955f9abab5fe
Diffstat (limited to 'examples/webenginewidgets/simplebrowser/data/simplebrowser.qrc')
| -rw-r--r-- | examples/webenginewidgets/simplebrowser/data/simplebrowser.qrc | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/examples/webenginewidgets/simplebrowser/data/simplebrowser.qrc b/examples/webenginewidgets/simplebrowser/data/simplebrowser.qrc new file mode 100644 index 000000000..5795063ca --- /dev/null +++ b/examples/webenginewidgets/simplebrowser/data/simplebrowser.qrc @@ -0,0 +1,12 @@ +<RCC> + <qresource prefix="/"> + <file>addtab.png</file> + <file>defaulticon.png</file> + <file>closetab.png</file> + <file>go-next.png</file> + <file>go-previous.png</file> + <file>process-stop.png</file> + <file>simplebrowser.svg</file> + <file>view-refresh.png</file> + </qresource> +</RCC> |