Skip to content

Commit 8032b17

Browse files
toreiniotoreinio
committed
Doc: Update copyright information in documentation templates
 - Update copyright year to 2015 - Update copyright holder to The Qt Company Ltd Change-Id: I2ed489f82639c93344051de38491183987a743e1 Reviewed-by: Leena Miettinen <[email protected]>
1 parent 124c10d commit 8032b17

14 files changed

+32
-32
lines changed

‎tools/assistant/tools/assistant/doc/assistant.qdocconf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ description = "Qt Assistant"
1010
HTML.{postheader,address} = ""
1111
HTML.footer = "<p /><address><hr /><div align=\"center\">\n" \
1212
"<table width=\"100%\" cellspacing=\"0\" border=\"0\"><tr class=\"address\">\n" \
13-
"<td width=\"30%\" align=\"left\">Copyright &copy; 2012 Digia Plc and/or its subsidiary(-ies)</td>\n" \
13+
"<td width=\"30%\" align=\"left\">Copyright &copy; 2015 The Qt Company Ltd</td>\n" \
1414
"<td width=\"40%\" align=\"center\">Trademarks</td>\n" \
1515
"<td width=\"30%\" align=\"right\"><div align=\"right\">Qt 4.8.7</div></td>\n" \
1616
"</tr></table></div></address>"

‎tools/qdoc3/doc/config/qt-html-templates-online.qdocconf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ HTML.footer = \
6363
" </div> \n" \
6464
" <div class=\"footer\">\n" \
6565
" <p>\n" \
66-
" <acronym title=\"Copyright\">&copy;</acronym> 2014 Digia Plc and/or its\n" \
67-
" subsidiaries. Documentation contributions included herein are the copyrights of\n" \
66+
" <acronym title=\"Copyright\">&copy;</acronym> 2015 The Qt Company Ltd.\n" \
67+
" Documentation contributions included herein are the copyrights of\n" \
6868
" their respective owners.</p>\n" \
6969
" <br />\n" \
7070
" <p>\n" \
@@ -76,7 +76,7 @@ HTML.footer = \
7676
" www.qt-project.org</a>.</p>\n" \
7777
" <br />\n" \
7878
" <p>\n" \
79-
" Digia, Qt and their respective logos are trademarks of Digia Plc \n" \
79+
" Qt and respective logos are trademarks of The Qt Company Ltd \n" \
8080
" in Finland and/or other countries worldwide. All other trademarks are property\n" \
8181
" of their respective owners. <a title=\"Privacy Policy\"\n" \
8282
" href=\"http://en.gitorious.org/privacy_policy/\">Privacy Policy</a></p>\n" \

‎tools/qdoc3/doc/config/qt-html-templates.qdocconf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ HTML.footer = \
2323
"</div> \n" \
2424
"<div class=\"footer\">\n" \
2525
" <p>\n" \
26-
" <acronym title=\"Copyright\">&copy;</acronym> 2014 Digia Plc and/or its\n" \
27-
" subsidiaries. Documentation contributions included herein are the copyrights of\n" \
26+
" <acronym title=\"Copyright\">&copy;</acronym> 2015 The Qt Company Ltd.\n" \
27+
" Documentation contributions included herein are the copyrights of\n" \
2828
" their respective owners.</p>\n" \
2929
" <br />\n" \
3030
" <p>\n" \
@@ -36,7 +36,7 @@ HTML.footer = \
3636
" www.qt-project.org</a>.</p>\n" \
3737
" <br />\n" \
3838
" <p>\n" \
39-
" Digia, Qt and their respective logos are trademarks of Digia Plc \n" \
39+
" Qt and respective logos are trademarks of The Qt Company Ltd \n" \
4040
" in Finland and/or other countries worldwide. All other trademarks are property\n" \
4141
" of their respective owners. <a title=\"Privacy Policy\"\n" \
4242
" href=\"http://en.gitorious.org/privacy_policy/\">Privacy Policy</a></p>\n" \

‎tools/qdoc3/test/carbide-eclipse-integration.qdocconf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ macro.TheEclipseIntegration = Carbide.c++
66

77
HTML.footer = "<p /><address><hr /><div align=\"center\">\n" \
88
"<table width=\"100%\" cellspacing=\"0\" border=\"0\"><tr class=\"address\">\n" \
9-
"<td width=\"30%\" align=\"left\">Copyright &copy; 2014 Digia Plc and/or its subsidiary(-ies)</td>\n" \
9+
"<td width=\"30%\" align=\"left\">Copyright &copy; 2015 The Qt Company Ltd.</td>\n" \
1010
"<td width=\"40%\" align=\"center\"><a href=\"http://qt.nokia.com/doc\">Trademarks</a></td>\n" \
1111
"<td width=\"30%\" align=\"right\"><div align=\"right\">Carbide.c++</div></td>\n" \
1212
"</tr></table></div></address>"

‎tools/qdoc3/test/jambi.qdocconf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ HTML.postheader = "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0
4242

4343
HTML.footer = "<p /><address><hr /><div align=\"center\">\n" \
4444
"<table width=\"100%\" cellspacing=\"0\" border=\"0\"><tr class=\"address\">\n" \
45-
"<td width=\"30%\" align=\"left\">Copyright &copy; 2014 Digia Plc and/or its subsidiary(-ies)</td>\n" \
45+
"<td width=\"30%\" align=\"left\">Copyright &copy; 2015 The Qt Company Ltd.</td>\n" \
4646
"<td width=\"40%\" align=\"center\"><a href=\"trademarks.html\">Trademarks</a></td>\n" \
4747
"<td width=\"30%\" align=\"right\"><div align=\"right\">Qt Jambi \\version</div></td>\n" \
4848
"</tr></table></div></address>"

‎tools/qdoc3/test/qt-html-templates-online.qdocconf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,8 +150,8 @@ HTML.footer = \
150150
" </div> \n" \
151151
" <div class=\"footer\">\n" \
152152
" <p>\n" \
153-
" <acronym title=\"Copyright\">&copy;</acronym> 2014 Digia Plc and/or its\n" \
154-
" subsidiaries. Documentation contributions included herein are the copyrights of\n" \
153+
" <acronym title=\"Copyright\">&copy;</acronym> 2015 The Qt Company Ltd.\n" \
154+
" Documentation contributions included herein are the copyrights of\n" \
155155
" their respective owners.</p>\n" \
156156
" <br />\n" \
157157
" <p>\n" \
@@ -163,7 +163,7 @@ HTML.footer = \
163163
" www.qt-project.org</a>.</p>\n" \
164164
" <br />\n" \
165165
" <p>\n" \
166-
" Digia, Qt and their respective logos are trademarks of Digia Plc \n" \
166+
" Qt and respective logos are trademarks of The Qt Company Ltd \n" \
167167
" in Finland and/or other countries worldwide. All other trademarks are property\n" \
168168
" of their respective owners. <a title=\"Privacy Policy\"\n" \
169169
" href=\"http://en.gitorious.org/privacy_policy/\">Privacy Policy</a></p>\n" \

‎tools/qdoc3/test/qt-html-templates.qdocconf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ HTML.footer = \
2323
"</div> \n" \
2424
"<div class=\"footer\">\n" \
2525
" <p>\n" \
26-
" <acronym title=\"Copyright\">&copy;</acronym> 2014 Digia Plc and/or its\n" \
27-
" subsidiaries. Documentation contributions included herein are the copyrights of\n" \
26+
" <acronym title=\"Copyright\">&copy;</acronym> 2015 The Qt Company Ltd.\n" \
27+
" Documentation contributions included herein are the copyrights of\n" \
2828
" their respective owners.</p>\n" \
2929
" <br />\n" \
3030
" <p>\n" \
@@ -36,7 +36,7 @@ HTML.footer = \
3636
" www.qt-project.org</a>.</p>\n" \
3737
" <br />\n" \
3838
" <p>\n" \
39-
" Digia, Qt and their respective logos are trademarks of Digia Plc \n" \
39+
" Qt and respective logos are trademarks of The Qt Company Ltd \n" \
4040
" in Finland and/or other countries worldwide. All other trademarks are property\n" \
4141
" of their respective owners. <a title=\"Privacy Policy\"\n" \
4242
" href=\"http://en.gitorious.org/privacy_policy/\">Privacy Policy</a></p>\n" \

‎tools/qdoc3/test/qt-html-templates_ja_JP-online.qdocconf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,8 @@ HTML.footer = \
145145
" </div> \n" \
146146
" <div class=\"footer\">\n" \
147147
" <p>\n" \
148-
" <acronym title=\"Copyright\">&copy;</acronym> 2014 Digia Plc and/or its\n" \
149-
" subsidiaries. Documentation contributions included herein are the copyrights of\n" \
148+
" <acronym title=\"Copyright\">&copy;</acronym> 2015 The Qt Company Ltd.\n" \
149+
" Documentation contributions included herein are the copyrights of\n" \
150150
" their respective owners.</p>\n" \
151151
" <br />\n" \
152152
" <p>\n" \
@@ -158,7 +158,7 @@ HTML.footer = \
158158
" www.qt-project.org</a>.</p>\n" \
159159
" <br />\n" \
160160
" <p>\n" \
161-
" Digia, Qt and their respective logos are trademarks of Digia Plc \n" \
161+
" Qt and respective logos are trademarks of The Qt Company Ltd \n" \
162162
" in Finland and/or other countries worldwide. All other trademarks are property\n" \
163163
" of their respective owners. <a title=\"Privacy Policy\"\n" \
164164
" href=\"http://en.gitorious.org/privacy_policy/\">Privacy Policy</a></p>\n" \

‎tools/qdoc3/test/qt-html-templates_ja_JP.qdocconf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ HTML.footer = \
3636
" </div> \n" \
3737
" <div class=\"footer\">\n" \
3838
" <p>\n" \
39-
" <acronym title=\"Copyright\">&copy;</acronym> 2014 Digia Plc and/or its\n" \
40-
" subsidiaries. Documentation contributions included herein are the copyrights of\n" \
39+
" <acronym title=\"Copyright\">&copy;</acronym> 2015 The Qt Company Ltd.\n" \
40+
" Documentation contributions included herein are the copyrights of\n" \
4141
" their respective owners.</p>\n" \
4242
" <br />\n" \
4343
" <p>\n" \
@@ -49,7 +49,7 @@ HTML.footer = \
4949
" www.qt-project.org</a>.</p>\n" \
5050
" <br />\n" \
5151
" <p>\n" \
52-
" Digia, Qt and their respective logos are trademarks of Digia Plc \n" \
52+
" Qt and respective logos are trademarks of The Qt Company Ltd \n" \
5353
" in Finland and/or other countries worldwide. All other trademarks are property\n" \
5454
" of their respective owners. <a title=\"Privacy Policy\"\n" \
5555
" href=\"http://en.gitorious.org/privacy_policy/\">Privacy Policy</a></p>\n" \

‎tools/qdoc3/test/qt-html-templates_zh_CN-online.qdocconf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,8 @@ HTML.footer = \
145145
" </div> \n" \
146146
" <div class=\"footer\">\n" \
147147
" <p>\n" \
148-
" <acronym title=\"Copyright\">&copy;</acronym> 2014 Digia Plc and/or its\n" \
149-
" subsidiaries. Documentation contributions included herein are the copyrights of\n" \
148+
" <acronym title=\"Copyright\">&copy;</acronym> 2015 The Qt Company Ltd.\n" \
149+
" Documentation contributions included herein are the copyrights of\n" \
150150
" their respective owners.</p>\n" \
151151
" <br />\n" \
152152
" <p>\n" \
@@ -158,7 +158,7 @@ HTML.footer = \
158158
" www.qt-project.org</a>.</p>\n" \
159159
" <br />\n" \
160160
" <p>\n" \
161-
" Digia, Qt and their respective logos are trademarks of Digia Plc \n" \
161+
" Qt and respective logos are trademarks of The Qt Company Ltd \n" \
162162
" in Finland and/or other countries worldwide. All other trademarks are property\n" \
163163
" of their respective owners. <a title=\"Privacy Policy\"\n" \
164164
" href=\"http://en.gitorious.org/privacy_policy/\">Privacy Policy</a></p>\n" \

‎tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,8 @@ HTML.footer = \
147147
" </div> \n" \
148148
" <div class=\"footer\">\n" \
149149
" <p>\n" \
150-
" <acronym title=\"Copyright\">&copy;</acronym> 2014 Digia Plc and/or its\n" \
151-
" subsidiaries. Documentation contributions included herein are the copyrights of\n" \
150+
" <acronym title=\"Copyright\">&copy;</acronym> 2015 The Qt Company Ltd.\n" \
151+
" Documentation contributions included herein are the copyrights of\n" \
152152
" their respective owners.</p>\n" \
153153
" <br />\n" \
154154
" <p>\n" \
@@ -160,7 +160,7 @@ HTML.footer = \
160160
" www.qt-project.org</a>.</p>\n" \
161161
" <br />\n" \
162162
" <p>\n" \
163-
" Digia, Qt and their respective logos are trademarks of Digia Plc \n" \
163+
" Qt and respective logos are trademarks of The Qt Company Ltd \n" \
164164
" in Finland and/or other countries worldwide. All other trademarks are property\n" \
165165
" of their respective owners. <a title=\"Privacy Policy\"\n" \
166166
" href=\"http://en.gitorious.org/privacy_policy/\">Privacy Policy</a></p>\n" \

‎tools/qdoc3/test/qt-project.qdocconf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ qhp.Qt.subprojects.examples.selectors = fake:example
3737

3838
dita.metadata.default.author = Qt Development Frameworks
3939
dita.metadata.default.permissions = all
40-
dita.metadata.default.publisher = Digia
41-
dita.metadata.default.copyryear = 2013
42-
dita.metadata.default.copyrholder = Digia
40+
dita.metadata.default.publisher = The Qt Company
41+
dita.metadata.default.copyryear = 2015
42+
dita.metadata.default.copyrholder = The Qt Company
4343
dita.metadata.default.audience = programmer
4444

4545
language = Cpp

‎tools/qdoc3/test/standalone-eclipse-integration.qdocconf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ macro.TheEclipseIntegration = The Qt Eclipse Integration
55

66
HTML.footer = "<p /><address><hr /><div align=\"center\">\n" \
77
"<table width=\"100%\" cellspacing=\"0\" border=\"0\"><tr class=\"address\">\n" \
8-
"<td width=\"30%\" align=\"left\">Copyright &copy; 2014 Digia Plc and/or its subsidiary(-ies)</td>\n" \
8+
"<td width=\"30%\" align=\"left\">Copyright &copy; 2015 The Qt Company Ltd.</td>\n" \
99
"<td width=\"40%\" align=\"center\"><a href=\"http://qt.nokia.com/doc/trademarks.html\">Trademarks</a></td>\n" \
1010
"<td width=\"30%\" align=\"right\"><div align=\"right\">Qt Eclipse Integration 1.5.3</div></td>\n" \
1111
"</tr></table></div></address>"

‎util/qlalr/doc/qlalr.qdocconf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ HTML.postheader = "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0
5959

6060
HTML.footer = "<p /><address><hr /><div align=\"center\">\n" \
6161
"<table width=\"100%\" cellspacing=\"0\" border=\"0\"><tr class=\"address\">\n" \
62-
"<td width=\"30%\" align=\"left\">Copyright &copy; 2012 Digia Plc and/or its subsidiary(-ies)</td>\n" \
62+
"<td width=\"30%\" align=\"left\">Copyright &copy; 2015 The Qt Company Ltd</td>\n" \
6363
"<td width=\"40%\" align=\"center\"><a href=\"trademarks.html\">Trademarks</a></td>\n" \
6464
"<td width=\"30%\" align=\"right\"><div align=\"right\">Qt \\version</div></td>\n" \
6565
"</tr></table></div></address>"

0 commit comments

Comments
 (0)