diff options
author | Kai Koehne <kai.koehne@qt.io> | 2018-08-15 12:57:50 +0200 |
---|---|---|
committer | Kai Koehne <kai.koehne@qt.io> | 2018-08-21 12:38:16 +0000 |
commit | dab4814dc4187db345a53b234c4cdd4cbdcf4bce (patch) | |
tree | e78a366082250b7248f93317ad4e3256b16f644c /examples/webenginewidgets/cookiebrowser | |
parent | e56dd7e37ea96c4ba1354e319bdaa9d01c401747 (diff) |
Document Tango icons used in examples
Task-number: QTBUG-62053
Change-Id: I2df300239f4f02bb74f1ec27a74874b3877aabd0
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'examples/webenginewidgets/cookiebrowser')
-rw-r--r-- | examples/webenginewidgets/cookiebrowser/3rdparty/COPYING | 1 | ||||
-rw-r--r-- | examples/webenginewidgets/cookiebrowser/3rdparty/qt_attribution.json | 24 | ||||
-rw-r--r-- | examples/webenginewidgets/cookiebrowser/3rdparty/view-refresh.png (renamed from examples/webenginewidgets/cookiebrowser/view-refresh.png) | bin | 1364 -> 1364 bytes | |||
-rw-r--r-- | examples/webenginewidgets/cookiebrowser/cookiebrowser.qrc | 2 | ||||
-rw-r--r-- | examples/webenginewidgets/cookiebrowser/doc/src/cookiebrowser.qdoc | 10 |
5 files changed, 36 insertions, 1 deletions
diff --git a/examples/webenginewidgets/cookiebrowser/3rdparty/COPYING b/examples/webenginewidgets/cookiebrowser/3rdparty/COPYING new file mode 100644 index 000000000..220881da6 --- /dev/null +++ b/examples/webenginewidgets/cookiebrowser/3rdparty/COPYING @@ -0,0 +1 @@ +The icons in this repository are herefore released into the Public Domain. diff --git a/examples/webenginewidgets/cookiebrowser/3rdparty/qt_attribution.json b/examples/webenginewidgets/cookiebrowser/3rdparty/qt_attribution.json new file mode 100644 index 000000000..91a0899c6 --- /dev/null +++ b/examples/webenginewidgets/cookiebrowser/3rdparty/qt_attribution.json @@ -0,0 +1,24 @@ +{ + "Id": "cookiebrowser-tango", + "Name": "Tango Icon Library", + "QDocModule": "qtwebengine", + "QtUsage": "Used in WebEngine Cookie Browser example.", + + "QtParts": [ "examples" ], + "Description": "Selected icons from the Tango Icon Library", + "Homepage": "http://tango.freedesktop.org/Tango_Icon_Library", + "Version": "0.8.90", + "DownloadLocation": "http://tango.freedesktop.org/releases/tango-icon-theme-0.8.90.tar.gz", + "LicenseId": "DocumentRef-PublicDomain", + "License": "Public Domain", + "LicenseFile": "COPYING", + "Copyright": "Ulisse Perusin <uli.peru@gmail.com> +Steven Garrity <sgarrity@silverorange.com> +Lapo Calamandrei <calamandrei@gmail.com> +Ryan Collier <rcollier@novell.com> +Rodney Dawes <dobey@novell.com> +Andreas Nilsson <nisses.mail@home.se> +Tuomas Kuosmanen <tigert@tigert.com> +Garrett LeSage <garrett@novell.com> +Jakub Steiner <jimmac@novell.com>" +} diff --git a/examples/webenginewidgets/cookiebrowser/view-refresh.png b/examples/webenginewidgets/cookiebrowser/3rdparty/view-refresh.png Binary files differindex cab4d02c7..cab4d02c7 100644 --- a/examples/webenginewidgets/cookiebrowser/view-refresh.png +++ b/examples/webenginewidgets/cookiebrowser/3rdparty/view-refresh.png diff --git a/examples/webenginewidgets/cookiebrowser/cookiebrowser.qrc b/examples/webenginewidgets/cookiebrowser/cookiebrowser.qrc index 8805f2c53..a1cebd6a7 100644 --- a/examples/webenginewidgets/cookiebrowser/cookiebrowser.qrc +++ b/examples/webenginewidgets/cookiebrowser/cookiebrowser.qrc @@ -1,5 +1,5 @@ <RCC> <qresource prefix="/"> - <file>view-refresh.png</file> + <file alias="view-refresh.png">3rdparty/view-refresh.png</file> </qresource> </RCC> diff --git a/examples/webenginewidgets/cookiebrowser/doc/src/cookiebrowser.qdoc b/examples/webenginewidgets/cookiebrowser/doc/src/cookiebrowser.qdoc index 55ccd33d5..a1b4eeb18 100644 --- a/examples/webenginewidgets/cookiebrowser/doc/src/cookiebrowser.qdoc +++ b/examples/webenginewidgets/cookiebrowser/doc/src/cookiebrowser.qdoc @@ -38,4 +38,14 @@ well as delete cookies and add new cookies. \include examples-run.qdocinc + + \section1 Files and Attributions + + The example uses icons from the Tango Icon Library: + + \table + \row + \li \l{cookiebrowser-tango}{Tango Icon Library} + \li Public Domain + \endtable */ |