From dab4814dc4187db345a53b234c4cdd4cbdcf4bce Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@qt.io>
Date: Wed, 15 Aug 2018 12:57:50 +0200
Subject: Document Tango icons used in examples
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Task-number: QTBUG-62053
Change-Id: I2df300239f4f02bb74f1ec27a74874b3877aabd0
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
---
 .../cookiebrowser/3rdparty/COPYING                 |   1 +
 .../cookiebrowser/3rdparty/qt_attribution.json     |  24 +++++++++++++++++++++
 .../cookiebrowser/3rdparty/view-refresh.png        | Bin 0 -> 1364 bytes
 .../cookiebrowser/cookiebrowser.qrc                |   2 +-
 .../cookiebrowser/doc/src/cookiebrowser.qdoc       |  10 +++++++++
 .../cookiebrowser/view-refresh.png                 | Bin 1364 -> 0 bytes
 6 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 examples/webenginewidgets/cookiebrowser/3rdparty/COPYING
 create mode 100644 examples/webenginewidgets/cookiebrowser/3rdparty/qt_attribution.json
 create mode 100644 examples/webenginewidgets/cookiebrowser/3rdparty/view-refresh.png
 delete mode 100644 examples/webenginewidgets/cookiebrowser/view-refresh.png

(limited to 'examples/webenginewidgets/cookiebrowser')

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/3rdparty/view-refresh.png b/examples/webenginewidgets/cookiebrowser/3rdparty/view-refresh.png
new file mode 100644
index 000000000..cab4d02c7
Binary files /dev/null and b/examples/webenginewidgets/cookiebrowser/3rdparty/view-refresh.png differ
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
 */
diff --git a/examples/webenginewidgets/cookiebrowser/view-refresh.png b/examples/webenginewidgets/cookiebrowser/view-refresh.png
deleted file mode 100644
index cab4d02c7..000000000
Binary files a/examples/webenginewidgets/cookiebrowser/view-refresh.png and /dev/null differ
-- 
cgit v1.2.3