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/stylesheetbrowser/doc/src/stylesheetbrowser.qdoc | |
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/stylesheetbrowser/doc/src/stylesheetbrowser.qdoc')
-rw-r--r-- | examples/webenginewidgets/stylesheetbrowser/doc/src/stylesheetbrowser.qdoc | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/examples/webenginewidgets/stylesheetbrowser/doc/src/stylesheetbrowser.qdoc b/examples/webenginewidgets/stylesheetbrowser/doc/src/stylesheetbrowser.qdoc index b4db10836..5b271bafb 100644 --- a/examples/webenginewidgets/stylesheetbrowser/doc/src/stylesheetbrowser.qdoc +++ b/examples/webenginewidgets/stylesheetbrowser/doc/src/stylesheetbrowser.qdoc @@ -55,4 +55,14 @@ \quotefromfile webenginewidgets/stylesheetbrowser/mainwindow.cpp \skipto MainWindow::removeStyleSheet \printuntil /^\}/ + + \section1 Files and Attributions + + The example uses icons from the Tango Icon Library: + + \table + \row + \li \l{stylesheetbrowser-tango}{Tango Icon Library} + \li Public Domain + \endtable */ |