diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-09-17 13:11:20 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-09-17 13:11:20 +0200 |
| commit | d74fd9b0d9bf5ab80e6c104fec5a92a9b3b9372d (patch) | |
| tree | 25056d484013efbbbb3eb1a78ad6a6449b671578 /examples/webenginewidgets/simplebrowser/doc | |
| parent | 7de23e9fbb4c48152de5c1d26ed34cd68666aa30 (diff) | |
| parent | 89afebb830f616a6e8c43dd37bf34551f243b264 (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
src/3rdparty
src/core/core_common.pri
Change-Id: I36dc3a70aa653e6c8a610c787b615034180a6127
Diffstat (limited to 'examples/webenginewidgets/simplebrowser/doc')
| -rw-r--r-- | examples/webenginewidgets/simplebrowser/doc/src/simplebrowser.qdoc | 12 |
1 files changed, 8 insertions, 4 deletions
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 */ |