Skip to content

Commit dab4814

Browse files
kkoehnekkoehne
committed
Document Tango icons used in examples
Task-number: QTBUG-62053 Change-Id: I2df300239f4f02bb74f1ec27a74874b3877aabd0 Reviewed-by: Michael Brüning <[email protected]>
1 parent e56dd7e commit dab4814

31 files changed

+158
-22
lines changed

‎examples/webengine/quicknanobrowser/doc/src/quicknanobrowser.qdoc

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,4 +136,14 @@
136136
\printuntil Action
137137
\skipto Escape
138138
\printuntil /^\ {4}\}/
139+
140+
\section1 Files and Attributions
141+
142+
The example uses icons from the Tango Icon Library:
143+
144+
\table
145+
\row
146+
\li \l{quicknanobrowser-tango}{Tango Icon Library}
147+
\li Public Domain
148+
\endtable
139149
*/

‎examples/webengine/quicknanobrowser/icons/3rdparty/COPYING

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
The icons in this repository are herefore released into the Public Domain.

‎examples/webengine/quicknanobrowser/icons/go-next.png renamed to ‎examples/webengine/quicknanobrowser/icons/3rdparty/go-next.png

File renamed without changes.

‎examples/webengine/quicknanobrowser/icons/go-previous.png renamed to ‎examples/webengine/quicknanobrowser/icons/3rdparty/go-previous.png

File renamed without changes.

‎examples/webengine/quicknanobrowser/icons/process-stop.png renamed to ‎examples/webengine/quicknanobrowser/icons/3rdparty/process-stop.png

File renamed without changes.

‎examples/webengine/quicknanobrowser/icons/3rdparty/qt_attribution.json

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{
2+
"Id": "quicknanobrowser-tango",
3+
"Name": "Tango Icon Library",
4+
"QDocModule": "qtwebengine",
5+
"QtUsage": "Used in WebEngine Quick Nano Browser example.",
6+
7+
"QtParts": [ "examples" ],
8+
"Description": "Selected icons from the Tango Icon Library",
9+
"Homepage": "http://tango.freedesktop.org/Tango_Icon_Library",
10+
"Version": "0.8.90",
11+
"DownloadLocation": "http://tango.freedesktop.org/releases/tango-icon-theme-0.8.90.tar.gz",
12+
"LicenseId": "DocumentRef-PublicDomain",
13+
"License": "Public Domain",
14+
"LicenseFile": "COPYING",
15+
"Copyright": "Ulisse Perusin <[email protected]>
16+
Steven Garrity <[email protected]>
17+
Lapo Calamandrei <[email protected]>
18+
Ryan Collier <[email protected]>
19+
Rodney Dawes <[email protected]>
20+
Andreas Nilsson <[email protected]>
21+
Tuomas Kuosmanen <[email protected]>
22+
Garrett LeSage <[email protected]>
23+
Jakub Steiner <[email protected]>"
24+
}

‎examples/webengine/quicknanobrowser/icons/view-refresh.png renamed to ‎examples/webengine/quicknanobrowser/icons/3rdparty/view-refresh.png

File renamed without changes.

‎examples/webengine/quicknanobrowser/resources.qrc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<file>FullScreenNotification.qml</file>
88
</qresource>
99
<qresource prefix="icons">
10-
<file alias="go-next.png">icons/go-next.png</file>
11-
<file alias="go-previous.png">icons/go-previous.png</file>
12-
<file alias="process-stop.png">icons/process-stop.png</file>
13-
<file alias="view-refresh.png">icons/view-refresh.png</file>
10+
<file alias="go-next.png">icons/3rdparty/go-next.png</file>
11+
<file alias="go-previous.png">icons/3rdparty/go-previous.png</file>
12+
<file alias="process-stop.png">icons/3rdparty/process-stop.png</file>
13+
<file alias="view-refresh.png">icons/3rdparty/view-refresh.png</file>
1414
</qresource>
1515
</RCC>

‎examples/webenginewidgets/cookiebrowser/3rdparty/COPYING

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
The icons in this repository are herefore released into the Public Domain.

‎examples/webenginewidgets/cookiebrowser/3rdparty/qt_attribution.json

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{
2+
"Id": "cookiebrowser-tango",
3+
"Name": "Tango Icon Library",
4+
"QDocModule": "qtwebengine",
5+
"QtUsage": "Used in WebEngine Cookie Browser example.",
6+
7+
"QtParts": [ "examples" ],
8+
"Description": "Selected icons from the Tango Icon Library",
9+
"Homepage": "http://tango.freedesktop.org/Tango_Icon_Library",
10+
"Version": "0.8.90",
11+
"DownloadLocation": "http://tango.freedesktop.org/releases/tango-icon-theme-0.8.90.tar.gz",
12+
"LicenseId": "DocumentRef-PublicDomain",
13+
"License": "Public Domain",
14+
"LicenseFile": "COPYING",
15+
"Copyright": "Ulisse Perusin <[email protected]>
16+
Steven Garrity <[email protected]>
17+
Lapo Calamandrei <[email protected]>
18+
Ryan Collier <[email protected]>
19+
Rodney Dawes <[email protected]>
20+
Andreas Nilsson <[email protected]>
21+
Tuomas Kuosmanen <[email protected]>
22+
Garrett LeSage <[email protected]>
23+
Jakub Steiner <[email protected]>"
24+
}

‎examples/webenginewidgets/cookiebrowser/view-refresh.png renamed to ‎examples/webenginewidgets/cookiebrowser/3rdparty/view-refresh.png

File renamed without changes.

‎examples/webenginewidgets/cookiebrowser/cookiebrowser.qrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<RCC>
22
<qresource prefix="/">
3-
<file>view-refresh.png</file>
3+
<file alias="view-refresh.png">3rdparty/view-refresh.png</file>
44
</qresource>
55
</RCC>

‎examples/webenginewidgets/cookiebrowser/doc/src/cookiebrowser.qdoc

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,14 @@
3838
well as delete cookies and add new cookies.
3939

4040
\include examples-run.qdocinc
41+
42+
\section1 Files and Attributions
43+
44+
The example uses icons from the Tango Icon Library:
45+
46+
\table
47+
\row
48+
\li \l{cookiebrowser-tango}{Tango Icon Library}
49+
\li Public Domain
50+
\endtable
4151
*/

‎examples/webenginewidgets/simplebrowser/data/3rdparty/COPYING

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
The icons in this repository are herefore released into the Public Domain.

‎examples/webenginewidgets/simplebrowser/data/dialog-error.png renamed to ‎examples/webenginewidgets/simplebrowser/data/3rdparty/dialog-error.png

File renamed without changes.

‎examples/webenginewidgets/simplebrowser/data/edit-clear.png renamed to ‎examples/webenginewidgets/simplebrowser/data/3rdparty/edit-clear.png

File renamed without changes.

‎examples/webenginewidgets/simplebrowser/data/go-bottom.png renamed to ‎examples/webenginewidgets/simplebrowser/data/3rdparty/go-bottom.png

File renamed without changes.

‎examples/webenginewidgets/simplebrowser/data/go-next.png renamed to ‎examples/webenginewidgets/simplebrowser/data/3rdparty/go-next.png

File renamed without changes.

‎examples/webenginewidgets/simplebrowser/data/go-previous.png renamed to ‎examples/webenginewidgets/simplebrowser/data/3rdparty/go-previous.png

File renamed without changes.

‎examples/webenginewidgets/simplebrowser/data/process-stop.png renamed to ‎examples/webenginewidgets/simplebrowser/data/3rdparty/process-stop.png

File renamed without changes.

‎examples/webenginewidgets/simplebrowser/data/3rdparty/qt_attribution.json

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{
2+
"Id": "simplebrowser-tango",
3+
"Name": "Tango Icon Library",
4+
"QDocModule": "qtwebengine",
5+
"QtUsage": "Used in WebEngine SimpleBrowser example.",
6+
7+
"QtParts": [ "examples" ],
8+
"Description": "Selected icons from the Tango Icon Library",
9+
"Homepage": "http://tango.freedesktop.org/Tango_Icon_Library",
10+
"Version": "0.8.90",
11+
"DownloadLocation": "http://tango.freedesktop.org/releases/tango-icon-theme-0.8.90.tar.gz",
12+
"LicenseId": "DocumentRef-PublicDomain",
13+
"License": "Public Domain",
14+
"LicenseFile": "COPYING",
15+
"Copyright": "Ulisse Perusin <[email protected]>
16+
Steven Garrity <[email protected]>
17+
Lapo Calamandrei <[email protected]>
18+
Ryan Collier <[email protected]>
19+
Rodney Dawes <[email protected]>
20+
Andreas Nilsson <[email protected]>
21+
Tuomas Kuosmanen <[email protected]>
22+
Garrett LeSage <[email protected]>
23+
Jakub Steiner <[email protected]>"
24+
}

‎examples/webenginewidgets/simplebrowser/data/text-html.png renamed to ‎examples/webenginewidgets/simplebrowser/data/3rdparty/text-html.png

File renamed without changes.

‎examples/webenginewidgets/simplebrowser/data/view-refresh.png renamed to ‎examples/webenginewidgets/simplebrowser/data/3rdparty/view-refresh.png

File renamed without changes.

‎examples/webenginewidgets/simplebrowser/data/simplebrowser.qrc

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
<RCC>
22
<qresource prefix="/">
33
<file>AppLogoColor.png</file>
4-
<file>dialog-error.png</file>
5-
<file>edit-clear.png</file>
6-
<file>go-bottom.png</file>
7-
<file>go-next.png</file>
8-
<file>go-previous.png</file>
9-
<file>process-stop.png</file>
10-
<file>text-html.png</file>
11-
<file>view-refresh.png</file>
124
<file>ninja.png</file>
135
</qresource>
6+
<qresource prefix="/">
7+
<file alias="dialog-error.png">3rdparty/dialog-error.png</file>
8+
<file alias="edit-clear.png">3rdparty/edit-clear.png</file>
9+
<file alias="go-bottom.png">3rdparty/go-bottom.png</file>
10+
<file alias="go-next.png">3rdparty/go-next.png</file>
11+
<file alias="go-previous.png">3rdparty/go-previous.png</file>
12+
<file alias="process-stop.png">3rdparty/process-stop.png</file>
13+
<file alias="text-html.png">3rdparty/text-html.png</file>
14+
<file alias="view-refresh.png">3rdparty/view-refresh.png</file>
15+
</qresource>
1416
</RCC>

‎examples/webenginewidgets/simplebrowser/doc/src/simplebrowser.qdoc

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -327,9 +327,13 @@
327327
finished or when an error occurs. See \c downloadmanagerwidget.cpp for an
328328
example of how these signals can be handled.
329329

330-
\section1 Licensing
330+
\section1 Files and Attributions
331331

332-
All icons used in the example, with the exception of \c{AppLogoColor.png},
333-
originate from the public domain
334-
\l{http://tango.freedesktop.org/Tango_Icon_Library}{Tango Icon Library}.
332+
The example uses icons from the Tango Icon Library:
333+
334+
\table
335+
\row
336+
\li \l{simplebrowser-tango}{Tango Icon Library}
337+
\li Public Domain
338+
\endtable
335339
*/

‎examples/webenginewidgets/stylesheetbrowser/3rdparty/COPYING

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
The icons in this repository are herefore released into the Public Domain.

‎examples/webenginewidgets/stylesheetbrowser/3rdparty/qt_attribution.json

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{
2+
"Id": "stylesheetbrowser-tango",
3+
"Name": "Tango Icon Library",
4+
"QDocModule": "qtwebengine",
5+
"QtUsage": "Used in WebEngine StyleSheet Browser example.",
6+
7+
"QtParts": [ "examples" ],
8+
"Description": "Selected icons from the Tango Icon Library",
9+
"Homepage": "http://tango.freedesktop.org/Tango_Icon_Library",
10+
"Version": "0.8.90",
11+
"DownloadLocation": "http://tango.freedesktop.org/releases/tango-icon-theme-0.8.90.tar.gz",
12+
"LicenseId": "DocumentRef-PublicDomain",
13+
"License": "Public Domain",
14+
"LicenseFile": "COPYING",
15+
"Copyright": "Ulisse Perusin <[email protected]>
16+
Steven Garrity <[email protected]>
17+
Lapo Calamandrei <[email protected]>
18+
Ryan Collier <[email protected]>
19+
Rodney Dawes <[email protected]>
20+
Andreas Nilsson <[email protected]>
21+
Tuomas Kuosmanen <[email protected]>
22+
Garrett LeSage <[email protected]>
23+
Jakub Steiner <[email protected]>"
24+
}

‎examples/webenginewidgets/stylesheetbrowser/view-refresh.png renamed to ‎examples/webenginewidgets/stylesheetbrowser/3rdparty/view-refresh.png

File renamed without changes.

‎examples/webenginewidgets/stylesheetbrowser/doc/src/stylesheetbrowser.qdoc

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,4 +55,14 @@
5555
\quotefromfile webenginewidgets/stylesheetbrowser/mainwindow.cpp
5656
\skipto MainWindow::removeStyleSheet
5757
\printuntil /^\}/
58+
59+
\section1 Files and Attributions
60+
61+
The example uses icons from the Tango Icon Library:
62+
63+
\table
64+
\row
65+
\li \l{stylesheetbrowser-tango}{Tango Icon Library}
66+
\li Public Domain
67+
\endtable
5868
*/

‎examples/webenginewidgets/stylesheetbrowser/stylesheetbrowser.qrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<RCC>
22
<qresource prefix="/">
3-
<file>view-refresh.png</file>
3+
<file alias="view-refresh.png">3rdparty/view-refresh.png</file>
44
</qresource>
55
</RCC>

‎tests/quicktestbrowser/resources.qrc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
</qresource>
1212
<qresource prefix="icons">
1313
<!-- To the risk of this breaking more often, do not duplicate the resources since this application won't be deployed -->
14-
<file alias="go-next.png">../../examples/webengine/quicknanobrowser/icons/go-next.png</file>
15-
<file alias="go-previous.png">../../examples/webengine/quicknanobrowser/icons/go-previous.png</file>
16-
<file alias="process-stop.png">../../examples/webengine/quicknanobrowser/icons/process-stop.png</file>
17-
<file alias="view-refresh.png">../../examples/webengine/quicknanobrowser/icons/view-refresh.png</file>
14+
<file alias="go-next.png">../../examples/webengine/quicknanobrowser/icons/3rdparty/go-next.png</file>
15+
<file alias="go-previous.png">../../examples/webengine/quicknanobrowser/icons/3rdparty/go-previous.png</file>
16+
<file alias="process-stop.png">../../examples/webengine/quicknanobrowser/icons/3rdparty/process-stop.png</file>
17+
<file alias="view-refresh.png">../../examples/webengine/quicknanobrowser/icons/3rdparty/view-refresh.png</file>
1818
</qresource>
1919
</RCC>

0 commit comments

Comments
 (0)