summaryrefslogtreecommitdiffstats
path: root/examples/webengine
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@qt.io>2018-08-15 12:57:50 +0200
committerKai Koehne <kai.koehne@qt.io>2018-08-21 12:38:16 +0000
commitdab4814dc4187db345a53b234c4cdd4cbdcf4bce (patch)
treee78a366082250b7248f93317ad4e3256b16f644c /examples/webengine
parente56dd7e37ea96c4ba1354e319bdaa9d01c401747 (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/webengine')
-rw-r--r--examples/webengine/quicknanobrowser/doc/src/quicknanobrowser.qdoc10
-rw-r--r--examples/webengine/quicknanobrowser/icons/3rdparty/COPYING1
-rw-r--r--examples/webengine/quicknanobrowser/icons/3rdparty/go-next.png (renamed from examples/webengine/quicknanobrowser/icons/go-next.png)bin930 -> 930 bytes
-rw-r--r--examples/webengine/quicknanobrowser/icons/3rdparty/go-previous.png (renamed from examples/webengine/quicknanobrowser/icons/go-previous.png)bin955 -> 955 bytes
-rw-r--r--examples/webengine/quicknanobrowser/icons/3rdparty/process-stop.png (renamed from examples/webengine/quicknanobrowser/icons/process-stop.png)bin1272 -> 1272 bytes
-rw-r--r--examples/webengine/quicknanobrowser/icons/3rdparty/qt_attribution.json24
-rw-r--r--examples/webengine/quicknanobrowser/icons/3rdparty/view-refresh.png (renamed from examples/webengine/quicknanobrowser/icons/view-refresh.png)bin1364 -> 1364 bytes
-rw-r--r--examples/webengine/quicknanobrowser/resources.qrc8
8 files changed, 39 insertions, 4 deletions
diff --git a/examples/webengine/quicknanobrowser/doc/src/quicknanobrowser.qdoc b/examples/webengine/quicknanobrowser/doc/src/quicknanobrowser.qdoc
index 190604fc4..3188bb299 100644
--- a/examples/webengine/quicknanobrowser/doc/src/quicknanobrowser.qdoc
+++ b/examples/webengine/quicknanobrowser/doc/src/quicknanobrowser.qdoc
@@ -136,4 +136,14 @@
\printuntil Action
\skipto Escape
\printuntil /^\ {4}\}/
+
+ \section1 Files and Attributions
+
+ The example uses icons from the Tango Icon Library:
+
+ \table
+ \row
+ \li \l{quicknanobrowser-tango}{Tango Icon Library}
+ \li Public Domain
+ \endtable
*/
diff --git a/examples/webengine/quicknanobrowser/icons/3rdparty/COPYING b/examples/webengine/quicknanobrowser/icons/3rdparty/COPYING
new file mode 100644
index 000000000..220881da6
--- /dev/null
+++ b/examples/webengine/quicknanobrowser/icons/3rdparty/COPYING
@@ -0,0 +1 @@
+The icons in this repository are herefore released into the Public Domain.
diff --git a/examples/webengine/quicknanobrowser/icons/go-next.png b/examples/webengine/quicknanobrowser/icons/3rdparty/go-next.png
index 6f3f65d33..6f3f65d33 100644
--- a/examples/webengine/quicknanobrowser/icons/go-next.png
+++ b/examples/webengine/quicknanobrowser/icons/3rdparty/go-next.png
Binary files differ
diff --git a/examples/webengine/quicknanobrowser/icons/go-previous.png b/examples/webengine/quicknanobrowser/icons/3rdparty/go-previous.png
index 93be3d1ee..93be3d1ee 100644
--- a/examples/webengine/quicknanobrowser/icons/go-previous.png
+++ b/examples/webengine/quicknanobrowser/icons/3rdparty/go-previous.png
Binary files differ
diff --git a/examples/webengine/quicknanobrowser/icons/process-stop.png b/examples/webengine/quicknanobrowser/icons/3rdparty/process-stop.png
index b68290bf1..b68290bf1 100644
--- a/examples/webengine/quicknanobrowser/icons/process-stop.png
+++ b/examples/webengine/quicknanobrowser/icons/3rdparty/process-stop.png
Binary files differ
diff --git a/examples/webengine/quicknanobrowser/icons/3rdparty/qt_attribution.json b/examples/webengine/quicknanobrowser/icons/3rdparty/qt_attribution.json
new file mode 100644
index 000000000..4e5a44448
--- /dev/null
+++ b/examples/webengine/quicknanobrowser/icons/3rdparty/qt_attribution.json
@@ -0,0 +1,24 @@
+{
+ "Id": "quicknanobrowser-tango",
+ "Name": "Tango Icon Library",
+ "QDocModule": "qtwebengine",
+ "QtUsage": "Used in WebEngine Quick Nano 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/webengine/quicknanobrowser/icons/view-refresh.png b/examples/webengine/quicknanobrowser/icons/3rdparty/view-refresh.png
index cab4d02c7..cab4d02c7 100644
--- a/examples/webengine/quicknanobrowser/icons/view-refresh.png
+++ b/examples/webengine/quicknanobrowser/icons/3rdparty/view-refresh.png
Binary files differ
diff --git a/examples/webengine/quicknanobrowser/resources.qrc b/examples/webengine/quicknanobrowser/resources.qrc
index 694f8d19b..c6270897d 100644
--- a/examples/webengine/quicknanobrowser/resources.qrc
+++ b/examples/webengine/quicknanobrowser/resources.qrc
@@ -7,9 +7,9 @@
<file>FullScreenNotification.qml</file>
</qresource>
<qresource prefix="icons">
- <file alias="go-next.png">icons/go-next.png</file>
- <file alias="go-previous.png">icons/go-previous.png</file>
- <file alias="process-stop.png">icons/process-stop.png</file>
- <file alias="view-refresh.png">icons/view-refresh.png</file>
+ <file alias="go-next.png">icons/3rdparty/go-next.png</file>
+ <file alias="go-previous.png">icons/3rdparty/go-previous.png</file>
+ <file alias="process-stop.png">icons/3rdparty/process-stop.png</file>
+ <file alias="view-refresh.png">icons/3rdparty/view-refresh.png</file>
</qresource>
</RCC>