diff options
| author | Jani Heikkinen <jani.heikkinen@theqtcompany.com> | 2015-01-28 10:44:43 +0200 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@theqtcompany.com> | 2015-02-11 06:49:51 +0000 |
| commit | 83a5694dc21b8220bb0e5c85f24a53361b2fd478 (patch) | |
| tree | eb3b8507747a3423bf0ca6d56a5c6c6c10ed5d39 /examples/webkit/webkit-guide/_index.html | |
| parent | 29daa7645b8d93e4a53e8cd85288740a80f441e9 (diff) | |
Update copyright headers
Qt copyrights are now in The Qt Company, so we could update the source
code headers accordingly. In the same go we should also fix the links to
point to qt.io.
Outdated header.LGPL removed (use header.LGPL21 instead)
Old header.LGPL3 renamed to header.LGPL3-COMM to match actual licensing
combination. New header.LGPL-COMM taken in the use file which were
using old header.LGPL3 (src/plugins/platforms/android/extract.cpp)
Added new header.LGPL3 containing Commercial + LGPLv3 + GPLv2 license
combination
Change-Id: I6f49b819a8a20cc4f88b794a8f6726d975e8ffbe
Reviewed-by: Matti Paaso <matti.paaso@theqtcompany.com>
Diffstat (limited to 'examples/webkit/webkit-guide/_index.html')
| -rw-r--r-- | examples/webkit/webkit-guide/_index.html | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/examples/webkit/webkit-guide/_index.html b/examples/webkit/webkit-guide/_index.html index 135d46e7dd..d683c0508e 100644 --- a/examples/webkit/webkit-guide/_index.html +++ b/examples/webkit/webkit-guide/_index.html @@ -280,15 +280,15 @@ entered (localStorage), but credit-card data s/b absent </div> <div class="footer"> <p> - <acronym title="Copyright">©</acronym> 2012 Digia Plc and/or its - subsidiaries. Digia, Qt and their respective logos are trademarks of Digia Plc - in Finland and/or other countries worldwide.</p> + <acronym title="Copyright">©</acronym> 2015 The Qt Company Ltd. + The Qt Company, Qt and their respective logos are trademarks of The Qt + Company Ltd in Finland and/or other countries worldwide.</p> <p> All other trademarks are property of their respective owners. <a title="Privacy Policy" href="http://qt.nokia.com/about/privacy-policy">Privacy Policy</a></p> <br /> <p> - Licensees holding valid Qt Commercial licenses may use this document in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia.</p> + Licensees holding valid Qt Commercial licenses may use this document in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and The Qt Company.</p> <p> Alternatively, this document may be used under the terms of the <a href="http://www.gnu.org/licenses/fdl.html">GNU Free Documentation License version 1.3</a> |