From 83a5694dc21b8220bb0e5c85f24a53361b2fd478 Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Wed, 28 Jan 2015 10:44:43 +0200 Subject: 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 --- doc/global/html-footer.qdocconf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'doc/global/html-footer.qdocconf') diff --git a/doc/global/html-footer.qdocconf b/doc/global/html-footer.qdocconf index 217494575f..0a35e14ead 100644 --- a/doc/global/html-footer.qdocconf +++ b/doc/global/html-footer.qdocconf @@ -8,13 +8,13 @@ HTML.footer = \ "\n" \ "
\n" \ "

\n" \ - " © 2015 Digia Plc and/or its\n" \ - " subsidiaries. Documentation contributions included herein are the copyrights of\n" \ + " © 2015 The Qt Company Ltd\n" \ + " Documentation contributions included herein are the copyrights of\n" \ " their respective owners.
" \ " The documentation provided herein is licensed under the terms of the" \ " GNU Free Documentation" \ " License version 1.3 as published by the Free Software Foundation.
" \ - " Digia, Qt and their respective logos are trademarks of Digia Plc " \ + " The Qt Company, Qt and their respective logos are trademarks of The Qt Company Ltd " \ " in Finland and/or other countries worldwide. All other trademarks are property\n" \ " of their respective owners.

\n" \ "
\n" \ -- cgit v1.2.3