Merge remote-tracking branch 'origin/5.11' into 5.12

Conflicts:
	src/3rdparty
	src/core/core_common.pri

Change-Id: I36dc3a70aa653e6c8a610c787b615034180a6127

22 files changed, 115 insertions, 14 deletions

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/view-refresh.png b/examples/webenginewidgets/cookiebrowser/3rdparty/view-refresh.png
index cab4d02c7..cab4d02c7 100644
--- a/examples/webenginewidgets/cookiebrowser/view-refresh.png
+++ b/examples/webenginewidgets/cookiebrowser/3rdparty/view-refresh.png
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/simplebrowser/data/3rdparty/COPYING b/examples/webenginewidgets/simplebrowser/data/3rdparty/COPYING
new file mode 100644
index 000000000..220881da6
--- /dev/null
+++ b/examples/webenginewidgets/simplebrowser/data/3rdparty/COPYING
@@ -0,0 +1 @@
+The icons in this repository are herefore released into the Public Domain.
diff --git a/examples/webenginewidgets/simplebrowser/data/dialog-error.png b/examples/webenginewidgets/simplebrowser/data/3rdparty/dialog-error.png
index cdd95bade..cdd95bade 100644
--- a/examples/webenginewidgets/simplebrowser/data/dialog-error.png
+++ b/examples/webenginewidgets/simplebrowser/data/3rdparty/dialog-error.png
diff --git a/examples/webenginewidgets/simplebrowser/data/edit-clear.png b/examples/webenginewidgets/simplebrowser/data/3rdparty/edit-clear.png
index 5542948bc..5542948bc 100644
--- a/examples/webenginewidgets/simplebrowser/data/edit-clear.png
+++ b/examples/webenginewidgets/simplebrowser/data/3rdparty/edit-clear.png
diff --git a/examples/webenginewidgets/simplebrowser/data/go-bottom.png b/examples/webenginewidgets/simplebrowser/data/3rdparty/go-bottom.png
index bf973fedc..bf973fedc 100644
--- a/examples/webenginewidgets/simplebrowser/data/go-bottom.png
+++ b/examples/webenginewidgets/simplebrowser/data/3rdparty/go-bottom.png
diff --git a/examples/webenginewidgets/simplebrowser/data/go-next.png b/examples/webenginewidgets/simplebrowser/data/3rdparty/go-next.png
index a68e2db77..a68e2db77 100644
--- a/examples/webenginewidgets/simplebrowser/data/go-next.png
+++ b/examples/webenginewidgets/simplebrowser/data/3rdparty/go-next.png
diff --git a/examples/webenginewidgets/simplebrowser/data/go-previous.png b/examples/webenginewidgets/simplebrowser/data/3rdparty/go-previous.png
index c37bc0414..c37bc0414 100644
--- a/examples/webenginewidgets/simplebrowser/data/go-previous.png
+++ b/examples/webenginewidgets/simplebrowser/data/3rdparty/go-previous.png
diff --git a/examples/webenginewidgets/simplebrowser/data/process-stop.png b/examples/webenginewidgets/simplebrowser/data/3rdparty/process-stop.png
index e7a8d1722..e7a8d1722 100644
--- a/examples/webenginewidgets/simplebrowser/data/process-stop.png
+++ b/examples/webenginewidgets/simplebrowser/data/3rdparty/process-stop.png
diff --git a/examples/webenginewidgets/simplebrowser/data/3rdparty/qt_attribution.json b/examples/webenginewidgets/simplebrowser/data/3rdparty/qt_attribution.json
new file mode 100644
index 000000000..853adeb20
--- /dev/null
+++ b/examples/webenginewidgets/simplebrowser/data/3rdparty/qt_attribution.json
@@ -0,0 +1,24 @@
+{
+    "Id": "simplebrowser-tango",
+    "Name": "Tango Icon Library",
+    "QDocModule": "qtwebengine",
+    "QtUsage": "Used in WebEngine SimpleBrowser 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/simplebrowser/data/text-html.png b/examples/webenginewidgets/simplebrowser/data/3rdparty/text-html.png
index a896697d7..a896697d7 100644
--- a/examples/webenginewidgets/simplebrowser/data/text-html.png
+++ b/examples/webenginewidgets/simplebrowser/data/3rdparty/text-html.png
diff --git a/examples/webenginewidgets/simplebrowser/data/view-refresh.png b/examples/webenginewidgets/simplebrowser/data/3rdparty/view-refresh.png
index 606ea9eba..606ea9eba 100644
--- a/examples/webenginewidgets/simplebrowser/data/view-refresh.png
+++ b/examples/webenginewidgets/simplebrowser/data/3rdparty/view-refresh.png
diff --git a/examples/webenginewidgets/simplebrowser/data/simplebrowser.qrc b/examples/webenginewidgets/simplebrowser/data/simplebrowser.qrc
index d81b08a64..eda8e3f3d 100644
--- a/examples/webenginewidgets/simplebrowser/data/simplebrowser.qrc
+++ b/examples/webenginewidgets/simplebrowser/data/simplebrowser.qrc
@@ -1,14 +1,16 @@
 <RCC>
     <qresource prefix="/">
         <file>AppLogoColor.png</file>
-        <file>dialog-error.png</file>
-        <file>edit-clear.png</file>
-        <file>go-bottom.png</file>
-        <file>go-next.png</file>
-        <file>go-previous.png</file>
-        <file>process-stop.png</file>
-        <file>text-html.png</file>
-        <file>view-refresh.png</file>
         <file>ninja.png</file>
     </qresource>
+    <qresource prefix="/">
+        <file alias="dialog-error.png">3rdparty/dialog-error.png</file>
+        <file alias="edit-clear.png">3rdparty/edit-clear.png</file>
+        <file alias="go-bottom.png">3rdparty/go-bottom.png</file>
+        <file alias="go-next.png">3rdparty/go-next.png</file>
+        <file alias="go-previous.png">3rdparty/go-previous.png</file>
+        <file alias="process-stop.png">3rdparty/process-stop.png</file>
+        <file alias="text-html.png">3rdparty/text-html.png</file>
+        <file alias="view-refresh.png">3rdparty/view-refresh.png</file>
+    </qresource>
 </RCC>
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
 */
diff --git a/examples/webenginewidgets/stylesheetbrowser/3rdparty/COPYING b/examples/webenginewidgets/stylesheetbrowser/3rdparty/COPYING
new file mode 100644
index 000000000..220881da6
--- /dev/null
+++ b/examples/webenginewidgets/stylesheetbrowser/3rdparty/COPYING
@@ -0,0 +1 @@
+The icons in this repository are herefore released into the Public Domain.
diff --git a/examples/webenginewidgets/stylesheetbrowser/3rdparty/qt_attribution.json b/examples/webenginewidgets/stylesheetbrowser/3rdparty/qt_attribution.json
new file mode 100644
index 000000000..ffca1812b
--- /dev/null
+++ b/examples/webenginewidgets/stylesheetbrowser/3rdparty/qt_attribution.json
@@ -0,0 +1,24 @@
+{
+    "Id": "stylesheetbrowser-tango",
+    "Name": "Tango Icon Library",
+    "QDocModule": "qtwebengine",
+    "QtUsage": "Used in WebEngine StyleSheet 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/stylesheetbrowser/view-refresh.png b/examples/webenginewidgets/stylesheetbrowser/3rdparty/view-refresh.png
index cab4d02c7..cab4d02c7 100644
--- a/examples/webenginewidgets/stylesheetbrowser/view-refresh.png
+++ b/examples/webenginewidgets/stylesheetbrowser/3rdparty/view-refresh.png
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
 */
diff --git a/examples/webenginewidgets/stylesheetbrowser/stylesheetbrowser.qrc b/examples/webenginewidgets/stylesheetbrowser/stylesheetbrowser.qrc
index 8805f2c53..a1cebd6a7 100644
--- a/examples/webenginewidgets/stylesheetbrowser/stylesheetbrowser.qrc
+++ b/examples/webenginewidgets/stylesheetbrowser/stylesheetbrowser.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>