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/simplebrowser | |
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/simplebrowser')
-rw-r--r-- | examples/webenginewidgets/simplebrowser/data/3rdparty/COPYING | 1 | ||||
-rw-r--r-- | examples/webenginewidgets/simplebrowser/data/3rdparty/dialog-error.png (renamed from examples/webenginewidgets/simplebrowser/data/dialog-error.png) | bin | 1645 -> 1645 bytes | |||
-rw-r--r-- | examples/webenginewidgets/simplebrowser/data/3rdparty/edit-clear.png (renamed from examples/webenginewidgets/simplebrowser/data/edit-clear.png) | bin | 1682 -> 1682 bytes | |||
-rw-r--r-- | examples/webenginewidgets/simplebrowser/data/3rdparty/go-bottom.png (renamed from examples/webenginewidgets/simplebrowser/data/go-bottom.png) | bin | 1263 -> 1263 bytes | |||
-rw-r--r-- | examples/webenginewidgets/simplebrowser/data/3rdparty/go-next.png (renamed from examples/webenginewidgets/simplebrowser/data/go-next.png) | bin | 1219 -> 1219 bytes | |||
-rw-r--r-- | examples/webenginewidgets/simplebrowser/data/3rdparty/go-previous.png (renamed from examples/webenginewidgets/simplebrowser/data/go-previous.png) | bin | 1200 -> 1200 bytes | |||
-rw-r--r-- | examples/webenginewidgets/simplebrowser/data/3rdparty/process-stop.png (renamed from examples/webenginewidgets/simplebrowser/data/process-stop.png) | bin | 1927 -> 1927 bytes | |||
-rw-r--r-- | examples/webenginewidgets/simplebrowser/data/3rdparty/qt_attribution.json | 24 | ||||
-rw-r--r-- | examples/webenginewidgets/simplebrowser/data/3rdparty/text-html.png (renamed from examples/webenginewidgets/simplebrowser/data/text-html.png) | bin | 1759 -> 1759 bytes | |||
-rw-r--r-- | examples/webenginewidgets/simplebrowser/data/3rdparty/view-refresh.png (renamed from examples/webenginewidgets/simplebrowser/data/view-refresh.png) | bin | 2024 -> 2024 bytes | |||
-rw-r--r-- | examples/webenginewidgets/simplebrowser/data/simplebrowser.qrc | 18 | ||||
-rw-r--r-- | examples/webenginewidgets/simplebrowser/doc/src/simplebrowser.qdoc | 12 |
12 files changed, 43 insertions, 12 deletions
diff --git a/examples/webenginewidgets/simplebrowser/data/3rdparty/COPYING b/examples/webenginewidgets/simplebrowser/data/3rdparty/COPYING new file mode 100644 index 000000000..220881da6 --- /dev/null +++ b/examples/webenginewidgets/simplebrowser/data/3rdparty/COPYING @@ -0,0 +1 @@ +The icons in this repository are herefore released into the Public Domain. diff --git a/examples/webenginewidgets/simplebrowser/data/dialog-error.png b/examples/webenginewidgets/simplebrowser/data/3rdparty/dialog-error.png Binary files differindex cdd95bade..cdd95bade 100644 --- a/examples/webenginewidgets/simplebrowser/data/dialog-error.png +++ b/examples/webenginewidgets/simplebrowser/data/3rdparty/dialog-error.png diff --git a/examples/webenginewidgets/simplebrowser/data/edit-clear.png b/examples/webenginewidgets/simplebrowser/data/3rdparty/edit-clear.png Binary files differindex 5542948bc..5542948bc 100644 --- a/examples/webenginewidgets/simplebrowser/data/edit-clear.png +++ b/examples/webenginewidgets/simplebrowser/data/3rdparty/edit-clear.png diff --git a/examples/webenginewidgets/simplebrowser/data/go-bottom.png b/examples/webenginewidgets/simplebrowser/data/3rdparty/go-bottom.png Binary files differindex bf973fedc..bf973fedc 100644 --- a/examples/webenginewidgets/simplebrowser/data/go-bottom.png +++ b/examples/webenginewidgets/simplebrowser/data/3rdparty/go-bottom.png diff --git a/examples/webenginewidgets/simplebrowser/data/go-next.png b/examples/webenginewidgets/simplebrowser/data/3rdparty/go-next.png Binary files differindex a68e2db77..a68e2db77 100644 --- a/examples/webenginewidgets/simplebrowser/data/go-next.png +++ b/examples/webenginewidgets/simplebrowser/data/3rdparty/go-next.png diff --git a/examples/webenginewidgets/simplebrowser/data/go-previous.png b/examples/webenginewidgets/simplebrowser/data/3rdparty/go-previous.png Binary files differindex c37bc0414..c37bc0414 100644 --- a/examples/webenginewidgets/simplebrowser/data/go-previous.png +++ b/examples/webenginewidgets/simplebrowser/data/3rdparty/go-previous.png diff --git a/examples/webenginewidgets/simplebrowser/data/process-stop.png b/examples/webenginewidgets/simplebrowser/data/3rdparty/process-stop.png Binary files differindex e7a8d1722..e7a8d1722 100644 --- a/examples/webenginewidgets/simplebrowser/data/process-stop.png +++ b/examples/webenginewidgets/simplebrowser/data/3rdparty/process-stop.png diff --git a/examples/webenginewidgets/simplebrowser/data/3rdparty/qt_attribution.json b/examples/webenginewidgets/simplebrowser/data/3rdparty/qt_attribution.json new file mode 100644 index 000000000..853adeb20 --- /dev/null +++ b/examples/webenginewidgets/simplebrowser/data/3rdparty/qt_attribution.json @@ -0,0 +1,24 @@ +{ + "Id": "simplebrowser-tango", + "Name": "Tango Icon Library", + "QDocModule": "qtwebengine", + "QtUsage": "Used in WebEngine SimpleBrowser 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/simplebrowser/data/text-html.png b/examples/webenginewidgets/simplebrowser/data/3rdparty/text-html.png Binary files differindex a896697d7..a896697d7 100644 --- a/examples/webenginewidgets/simplebrowser/data/text-html.png +++ b/examples/webenginewidgets/simplebrowser/data/3rdparty/text-html.png diff --git a/examples/webenginewidgets/simplebrowser/data/view-refresh.png b/examples/webenginewidgets/simplebrowser/data/3rdparty/view-refresh.png Binary files differindex 606ea9eba..606ea9eba 100644 --- a/examples/webenginewidgets/simplebrowser/data/view-refresh.png +++ b/examples/webenginewidgets/simplebrowser/data/3rdparty/view-refresh.png diff --git a/examples/webenginewidgets/simplebrowser/data/simplebrowser.qrc b/examples/webenginewidgets/simplebrowser/data/simplebrowser.qrc index d81b08a64..eda8e3f3d 100644 --- a/examples/webenginewidgets/simplebrowser/data/simplebrowser.qrc +++ b/examples/webenginewidgets/simplebrowser/data/simplebrowser.qrc @@ -1,14 +1,16 @@ <RCC> <qresource prefix="/"> <file>AppLogoColor.png</file> - <file>dialog-error.png</file> - <file>edit-clear.png</file> - <file>go-bottom.png</file> - <file>go-next.png</file> - <file>go-previous.png</file> - <file>process-stop.png</file> - <file>text-html.png</file> - <file>view-refresh.png</file> <file>ninja.png</file> </qresource> + <qresource prefix="/"> + <file alias="dialog-error.png">3rdparty/dialog-error.png</file> + <file alias="edit-clear.png">3rdparty/edit-clear.png</file> + <file alias="go-bottom.png">3rdparty/go-bottom.png</file> + <file alias="go-next.png">3rdparty/go-next.png</file> + <file alias="go-previous.png">3rdparty/go-previous.png</file> + <file alias="process-stop.png">3rdparty/process-stop.png</file> + <file alias="text-html.png">3rdparty/text-html.png</file> + <file alias="view-refresh.png">3rdparty/view-refresh.png</file> + </qresource> </RCC> diff --git a/examples/webenginewidgets/simplebrowser/doc/src/simplebrowser.qdoc b/examples/webenginewidgets/simplebrowser/doc/src/simplebrowser.qdoc index 2231d9667..b0c426232 100644 --- a/examples/webenginewidgets/simplebrowser/doc/src/simplebrowser.qdoc +++ b/examples/webenginewidgets/simplebrowser/doc/src/simplebrowser.qdoc @@ -327,9 +327,13 @@ finished or when an error occurs. See \c downloadmanagerwidget.cpp for an example of how these signals can be handled. - \section1 Licensing + \section1 Files and Attributions - All icons used in the example, with the exception of \c{AppLogoColor.png}, - originate from the public domain - \l{http://tango.freedesktop.org/Tango_Icon_Library}{Tango Icon Library}. + The example uses icons from the Tango Icon Library: + + \table + \row + \li \l{simplebrowser-tango}{Tango Icon Library} + \li Public Domain + \endtable */ |