diff options
| author | Jani Heikkinen <jani.heikkinen@theqtcompany.com> | 2015-02-13 07:59:24 +0200 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@theqtcompany.com> | 2015-02-17 11:53:55 +0000 |
| commit | a994d487ebb4b0e4084ae170c2846859e404a91d (patch) | |
| tree | 2a07b2b5ec09b57b506c0c72f3071018a74ffc42 /doc | |
| parent | 007772e642fc337a97e50f65babb62c520257476 (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.
Change-Id: I141862df4ed2475c05ebbeb8fe447c4a6e736849
Reviewed-by: Antti Kokko <antti.kokko@theqtcompany.com>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/config/qt-html-templates-online.qdocconf | 6 | ||||
| -rw-r--r-- | doc/config/qt-html-templates.qdocconf | 6 | ||||
| -rw-r--r-- | doc/config/qtsensors.qdocconf | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/doc/config/qt-html-templates-online.qdocconf b/doc/config/qt-html-templates-online.qdocconf index d08c27e0..370e17d1 100644 --- a/doc/config/qt-html-templates-online.qdocconf +++ b/doc/config/qt-html-templates-online.qdocconf @@ -99,8 +99,8 @@ HTML.footer = \ " </div> \n" \ " <div class=\"footer\">\n" \ " <p>\n" \ - " <acronym title=\"Copyright\">©</acronym> 2012 Digia Plc and/or its\n" \ - " subsidiaries. Digia, Qt and their respective logos are trademarks of Digia Plc \n" \ + " <acronym title=\"Copyright\">©</acronym> 2015 The Qt Company Ltd.\n" \ + " The Qt Company Ltd, Qt and their respective logos are trademarks of The Qt Company\n" \ " in Finland and/or other countries worldwide.</p>\n" \ " <p>\n" \ " All other trademarks are property of their respective owners. <a title=\"Privacy Policy\"\n" \ @@ -109,7 +109,7 @@ HTML.footer = \ " <p>\n" \ " 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>\n" \ + " with the terms contained in a written agreement between you and The Qt Company.</p>\n" \ " <p>\n" \ " Alternatively, this document may be used under the terms of the <a href=\"http://www.gnu.org/licenses/fdl.html\">GNU\n" \ " Free Documentation License version 1.3</a>\n" \ diff --git a/doc/config/qt-html-templates.qdocconf b/doc/config/qt-html-templates.qdocconf index 74afea32..759efb32 100644 --- a/doc/config/qt-html-templates.qdocconf +++ b/doc/config/qt-html-templates.qdocconf @@ -23,8 +23,8 @@ HTML.footer = \ "</div> \n" \ "<div class=\"footer\">\n" \ " <p>\n" \ - " <acronym title=\"Copyright\">©</acronym> 2012 Digia Plc and/or its\n" \ - " subsidiaries. Digia, Qt and their respective logos are trademarks of Digia Plc \n" \ + " <acronym title=\"Copyright\">©</acronym> 2015 The Qt Company Ltd.\n" \ + " The Qt Company, Qt and their respective logos are trademarks of The Qt Company Ltd \n" \ " in Finland and/or other countries worldwide.</p>\n" \ " <p>\n" \ " All other trademarks are property of their respective owners. <a title=\"Privacy Policy\"\n" \ @@ -33,7 +33,7 @@ HTML.footer = \ " <p>\n" \ " 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>\n" \ + " with the terms contained in a written agreement between you and The Qt Company.</p>\n" \ " <p>\n" \ " Alternatively, this document may be used under the terms of the <a href=\"http://www.gnu.org/licenses/fdl.html\">GNU\n" \ " Free Documentation License version 1.3</a>\n" \ diff --git a/doc/config/qtsensors.qdocconf b/doc/config/qtsensors.qdocconf index 2fbeea03..9e93f1bf 100644 --- a/doc/config/qtsensors.qdocconf +++ b/doc/config/qtsensors.qdocconf @@ -87,4 +87,4 @@ HTML.stylesheets = style/common.css HTML.headerstyles = " <link rel=\"stylesheet\" type=\"text/css\" href=\"style/common.css\" />\n" HTML.endheader = "</head>\n<body>\n" -HTML.footer = "<div class=\"footer\">Copyright (c) 2012 Digia Plc and/or its subsidiaries. All rights reserved.</div>\n" +HTML.footer = "<div class=\"footer\">Copyright (c) 2015 The Qt Company Ltd. All rights reserved.</div>\n" |