diff options
-rw-r--r-- | tools/assistant/tools/assistant/doc/assistant.qdocconf | 2 | ||||
-rw-r--r-- | tools/qdoc3/doc/config/qt-html-templates-online.qdocconf | 6 | ||||
-rw-r--r-- | tools/qdoc3/doc/config/qt-html-templates.qdocconf | 6 | ||||
-rw-r--r-- | tools/qdoc3/test/carbide-eclipse-integration.qdocconf | 2 | ||||
-rw-r--r-- | tools/qdoc3/test/jambi.qdocconf | 2 | ||||
-rw-r--r-- | tools/qdoc3/test/qt-html-templates-online.qdocconf | 6 | ||||
-rw-r--r-- | tools/qdoc3/test/qt-html-templates.qdocconf | 6 | ||||
-rw-r--r-- | tools/qdoc3/test/qt-html-templates_ja_JP-online.qdocconf | 6 | ||||
-rw-r--r-- | tools/qdoc3/test/qt-html-templates_ja_JP.qdocconf | 6 | ||||
-rw-r--r-- | tools/qdoc3/test/qt-html-templates_zh_CN-online.qdocconf | 6 | ||||
-rw-r--r-- | tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf | 6 | ||||
-rw-r--r-- | tools/qdoc3/test/qt-project.qdocconf | 6 | ||||
-rw-r--r-- | tools/qdoc3/test/standalone-eclipse-integration.qdocconf | 2 | ||||
-rw-r--r-- | util/qlalr/doc/qlalr.qdocconf | 2 |
14 files changed, 32 insertions, 32 deletions
diff --git a/tools/assistant/tools/assistant/doc/assistant.qdocconf b/tools/assistant/tools/assistant/doc/assistant.qdocconf index f01ff70..dbdb599 100644 --- a/tools/assistant/tools/assistant/doc/assistant.qdocconf +++ b/tools/assistant/tools/assistant/doc/assistant.qdocconf @@ -10,7 +10,7 @@ description = "Qt Assistant" HTML.{postheader,address} = "" HTML.footer = "<p /><address><hr /><div align=\"center\">\n" \ "<table width=\"100%\" cellspacing=\"0\" border=\"0\"><tr class=\"address\">\n" \ - "<td width=\"30%\" align=\"left\">Copyright © 2012 Digia Plc and/or its subsidiary(-ies)</td>\n" \ + "<td width=\"30%\" align=\"left\">Copyright © 2015 The Qt Company Ltd</td>\n" \ "<td width=\"40%\" align=\"center\">Trademarks</td>\n" \ "<td width=\"30%\" align=\"right\"><div align=\"right\">Qt 4.8.7</div></td>\n" \ "</tr></table></div></address>" diff --git a/tools/qdoc3/doc/config/qt-html-templates-online.qdocconf b/tools/qdoc3/doc/config/qt-html-templates-online.qdocconf index 04af014..d25cf99 100644 --- a/tools/qdoc3/doc/config/qt-html-templates-online.qdocconf +++ b/tools/qdoc3/doc/config/qt-html-templates-online.qdocconf @@ -63,8 +63,8 @@ HTML.footer = \ " </div> \n" \ " <div class=\"footer\">\n" \ " <p>\n" \ - " <acronym title=\"Copyright\">©</acronym> 2014 Digia Plc and/or its\n" \ - " subsidiaries. Documentation contributions included herein are the copyrights of\n" \ + " <acronym title=\"Copyright\">©</acronym> 2015 The Qt Company Ltd.\n" \ + " Documentation contributions included herein are the copyrights of\n" \ " their respective owners.</p>\n" \ " <br />\n" \ " <p>\n" \ @@ -76,7 +76,7 @@ HTML.footer = \ " www.qt-project.org</a>.</p>\n" \ " <br />\n" \ " <p>\n" \ - " Digia, Qt and their respective logos are trademarks of Digia Plc \n" \ + " Qt and respective logos are trademarks of The Qt Company Ltd \n" \ " in Finland and/or other countries worldwide. All other trademarks are property\n" \ " of their respective owners. <a title=\"Privacy Policy\"\n" \ " href=\"http://en.gitorious.org/privacy_policy/\">Privacy Policy</a></p>\n" \ diff --git a/tools/qdoc3/doc/config/qt-html-templates.qdocconf b/tools/qdoc3/doc/config/qt-html-templates.qdocconf index e87deb9..338ffce 100644 --- a/tools/qdoc3/doc/config/qt-html-templates.qdocconf +++ b/tools/qdoc3/doc/config/qt-html-templates.qdocconf @@ -23,8 +23,8 @@ HTML.footer = \ "</div> \n" \ "<div class=\"footer\">\n" \ " <p>\n" \ - " <acronym title=\"Copyright\">©</acronym> 2014 Digia Plc and/or its\n" \ - " subsidiaries. Documentation contributions included herein are the copyrights of\n" \ + " <acronym title=\"Copyright\">©</acronym> 2015 The Qt Company Ltd.\n" \ + " Documentation contributions included herein are the copyrights of\n" \ " their respective owners.</p>\n" \ " <br />\n" \ " <p>\n" \ @@ -36,7 +36,7 @@ HTML.footer = \ " www.qt-project.org</a>.</p>\n" \ " <br />\n" \ " <p>\n" \ - " Digia, Qt and their respective logos are trademarks of Digia Plc \n" \ + " Qt and respective logos are trademarks of The Qt Company Ltd \n" \ " in Finland and/or other countries worldwide. All other trademarks are property\n" \ " of their respective owners. <a title=\"Privacy Policy\"\n" \ " href=\"http://en.gitorious.org/privacy_policy/\">Privacy Policy</a></p>\n" \ diff --git a/tools/qdoc3/test/carbide-eclipse-integration.qdocconf b/tools/qdoc3/test/carbide-eclipse-integration.qdocconf index c454f08..c38d726 100644 --- a/tools/qdoc3/test/carbide-eclipse-integration.qdocconf +++ b/tools/qdoc3/test/carbide-eclipse-integration.qdocconf @@ -6,7 +6,7 @@ macro.TheEclipseIntegration = Carbide.c++ HTML.footer = "<p /><address><hr /><div align=\"center\">\n" \ "<table width=\"100%\" cellspacing=\"0\" border=\"0\"><tr class=\"address\">\n" \ - "<td width=\"30%\" align=\"left\">Copyright © 2014 Digia Plc and/or its subsidiary(-ies)</td>\n" \ + "<td width=\"30%\" align=\"left\">Copyright © 2015 The Qt Company Ltd.</td>\n" \ "<td width=\"40%\" align=\"center\"><a href=\"http://qt.nokia.com/doc\">Trademarks</a></td>\n" \ "<td width=\"30%\" align=\"right\"><div align=\"right\">Carbide.c++</div></td>\n" \ "</tr></table></div></address>" diff --git a/tools/qdoc3/test/jambi.qdocconf b/tools/qdoc3/test/jambi.qdocconf index f9483e3..7f5b422 100644 --- a/tools/qdoc3/test/jambi.qdocconf +++ b/tools/qdoc3/test/jambi.qdocconf @@ -42,7 +42,7 @@ HTML.postheader = "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0 HTML.footer = "<p /><address><hr /><div align=\"center\">\n" \ "<table width=\"100%\" cellspacing=\"0\" border=\"0\"><tr class=\"address\">\n" \ - "<td width=\"30%\" align=\"left\">Copyright © 2014 Digia Plc and/or its subsidiary(-ies)</td>\n" \ + "<td width=\"30%\" align=\"left\">Copyright © 2015 The Qt Company Ltd.</td>\n" \ "<td width=\"40%\" align=\"center\"><a href=\"trademarks.html\">Trademarks</a></td>\n" \ "<td width=\"30%\" align=\"right\"><div align=\"right\">Qt Jambi \\version</div></td>\n" \ "</tr></table></div></address>" diff --git a/tools/qdoc3/test/qt-html-templates-online.qdocconf b/tools/qdoc3/test/qt-html-templates-online.qdocconf index 6539e8d..b7aa8df 100644 --- a/tools/qdoc3/test/qt-html-templates-online.qdocconf +++ b/tools/qdoc3/test/qt-html-templates-online.qdocconf @@ -150,8 +150,8 @@ HTML.footer = \ " </div> \n" \ " <div class=\"footer\">\n" \ " <p>\n" \ - " <acronym title=\"Copyright\">©</acronym> 2014 Digia Plc and/or its\n" \ - " subsidiaries. Documentation contributions included herein are the copyrights of\n" \ + " <acronym title=\"Copyright\">©</acronym> 2015 The Qt Company Ltd.\n" \ + " Documentation contributions included herein are the copyrights of\n" \ " their respective owners.</p>\n" \ " <br />\n" \ " <p>\n" \ @@ -163,7 +163,7 @@ HTML.footer = \ " www.qt-project.org</a>.</p>\n" \ " <br />\n" \ " <p>\n" \ - " Digia, Qt and their respective logos are trademarks of Digia Plc \n" \ + " Qt and respective logos are trademarks of The Qt Company Ltd \n" \ " in Finland and/or other countries worldwide. All other trademarks are property\n" \ " of their respective owners. <a title=\"Privacy Policy\"\n" \ " href=\"http://en.gitorious.org/privacy_policy/\">Privacy Policy</a></p>\n" \ diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf index a6d9ce7..93c5faf 100644 --- a/tools/qdoc3/test/qt-html-templates.qdocconf +++ b/tools/qdoc3/test/qt-html-templates.qdocconf @@ -23,8 +23,8 @@ HTML.footer = \ "</div> \n" \ "<div class=\"footer\">\n" \ " <p>\n" \ - " <acronym title=\"Copyright\">©</acronym> 2014 Digia Plc and/or its\n" \ - " subsidiaries. Documentation contributions included herein are the copyrights of\n" \ + " <acronym title=\"Copyright\">©</acronym> 2015 The Qt Company Ltd.\n" \ + " Documentation contributions included herein are the copyrights of\n" \ " their respective owners.</p>\n" \ " <br />\n" \ " <p>\n" \ @@ -36,7 +36,7 @@ HTML.footer = \ " www.qt-project.org</a>.</p>\n" \ " <br />\n" \ " <p>\n" \ - " Digia, Qt and their respective logos are trademarks of Digia Plc \n" \ + " Qt and respective logos are trademarks of The Qt Company Ltd \n" \ " in Finland and/or other countries worldwide. All other trademarks are property\n" \ " of their respective owners. <a title=\"Privacy Policy\"\n" \ " href=\"http://en.gitorious.org/privacy_policy/\">Privacy Policy</a></p>\n" \ diff --git a/tools/qdoc3/test/qt-html-templates_ja_JP-online.qdocconf b/tools/qdoc3/test/qt-html-templates_ja_JP-online.qdocconf index 0ca433d..bc80f38 100644 --- a/tools/qdoc3/test/qt-html-templates_ja_JP-online.qdocconf +++ b/tools/qdoc3/test/qt-html-templates_ja_JP-online.qdocconf @@ -145,8 +145,8 @@ HTML.footer = \ " </div> \n" \ " <div class=\"footer\">\n" \ " <p>\n" \ - " <acronym title=\"Copyright\">©</acronym> 2014 Digia Plc and/or its\n" \ - " subsidiaries. Documentation contributions included herein are the copyrights of\n" \ + " <acronym title=\"Copyright\">©</acronym> 2015 The Qt Company Ltd.\n" \ + " Documentation contributions included herein are the copyrights of\n" \ " their respective owners.</p>\n" \ " <br />\n" \ " <p>\n" \ @@ -158,7 +158,7 @@ HTML.footer = \ " www.qt-project.org</a>.</p>\n" \ " <br />\n" \ " <p>\n" \ - " Digia, Qt and their respective logos are trademarks of Digia Plc \n" \ + " Qt and respective logos are trademarks of The Qt Company Ltd \n" \ " in Finland and/or other countries worldwide. All other trademarks are property\n" \ " of their respective owners. <a title=\"Privacy Policy\"\n" \ " href=\"http://en.gitorious.org/privacy_policy/\">Privacy Policy</a></p>\n" \ diff --git a/tools/qdoc3/test/qt-html-templates_ja_JP.qdocconf b/tools/qdoc3/test/qt-html-templates_ja_JP.qdocconf index 0adbbb8..7112db0 100644 --- a/tools/qdoc3/test/qt-html-templates_ja_JP.qdocconf +++ b/tools/qdoc3/test/qt-html-templates_ja_JP.qdocconf @@ -36,8 +36,8 @@ HTML.footer = \ " </div> \n" \ " <div class=\"footer\">\n" \ " <p>\n" \ - " <acronym title=\"Copyright\">©</acronym> 2014 Digia Plc and/or its\n" \ - " subsidiaries. Documentation contributions included herein are the copyrights of\n" \ + " <acronym title=\"Copyright\">©</acronym> 2015 The Qt Company Ltd.\n" \ + " Documentation contributions included herein are the copyrights of\n" \ " their respective owners.</p>\n" \ " <br />\n" \ " <p>\n" \ @@ -49,7 +49,7 @@ HTML.footer = \ " www.qt-project.org</a>.</p>\n" \ " <br />\n" \ " <p>\n" \ - " Digia, Qt and their respective logos are trademarks of Digia Plc \n" \ + " Qt and respective logos are trademarks of The Qt Company Ltd \n" \ " in Finland and/or other countries worldwide. All other trademarks are property\n" \ " of their respective owners. <a title=\"Privacy Policy\"\n" \ " href=\"http://en.gitorious.org/privacy_policy/\">Privacy Policy</a></p>\n" \ diff --git a/tools/qdoc3/test/qt-html-templates_zh_CN-online.qdocconf b/tools/qdoc3/test/qt-html-templates_zh_CN-online.qdocconf index ec14584..5c2cc69 100644 --- a/tools/qdoc3/test/qt-html-templates_zh_CN-online.qdocconf +++ b/tools/qdoc3/test/qt-html-templates_zh_CN-online.qdocconf @@ -145,8 +145,8 @@ HTML.footer = \ " </div> \n" \ " <div class=\"footer\">\n" \ " <p>\n" \ - " <acronym title=\"Copyright\">©</acronym> 2014 Digia Plc and/or its\n" \ - " subsidiaries. Documentation contributions included herein are the copyrights of\n" \ + " <acronym title=\"Copyright\">©</acronym> 2015 The Qt Company Ltd.\n" \ + " Documentation contributions included herein are the copyrights of\n" \ " their respective owners.</p>\n" \ " <br />\n" \ " <p>\n" \ @@ -158,7 +158,7 @@ HTML.footer = \ " www.qt-project.org</a>.</p>\n" \ " <br />\n" \ " <p>\n" \ - " Digia, Qt and their respective logos are trademarks of Digia Plc \n" \ + " Qt and respective logos are trademarks of The Qt Company Ltd \n" \ " in Finland and/or other countries worldwide. All other trademarks are property\n" \ " of their respective owners. <a title=\"Privacy Policy\"\n" \ " href=\"http://en.gitorious.org/privacy_policy/\">Privacy Policy</a></p>\n" \ diff --git a/tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf b/tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf index 6335f18..8032b59 100644 --- a/tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf +++ b/tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf @@ -147,8 +147,8 @@ HTML.footer = \ " </div> \n" \ " <div class=\"footer\">\n" \ " <p>\n" \ - " <acronym title=\"Copyright\">©</acronym> 2014 Digia Plc and/or its\n" \ - " subsidiaries. Documentation contributions included herein are the copyrights of\n" \ + " <acronym title=\"Copyright\">©</acronym> 2015 The Qt Company Ltd.\n" \ + " Documentation contributions included herein are the copyrights of\n" \ " their respective owners.</p>\n" \ " <br />\n" \ " <p>\n" \ @@ -160,7 +160,7 @@ HTML.footer = \ " www.qt-project.org</a>.</p>\n" \ " <br />\n" \ " <p>\n" \ - " Digia, Qt and their respective logos are trademarks of Digia Plc \n" \ + " Qt and respective logos are trademarks of The Qt Company Ltd \n" \ " in Finland and/or other countries worldwide. All other trademarks are property\n" \ " of their respective owners. <a title=\"Privacy Policy\"\n" \ " href=\"http://en.gitorious.org/privacy_policy/\">Privacy Policy</a></p>\n" \ diff --git a/tools/qdoc3/test/qt-project.qdocconf b/tools/qdoc3/test/qt-project.qdocconf index 1d2390c..fb1400d 100644 --- a/tools/qdoc3/test/qt-project.qdocconf +++ b/tools/qdoc3/test/qt-project.qdocconf @@ -37,9 +37,9 @@ qhp.Qt.subprojects.examples.selectors = fake:example dita.metadata.default.author = Qt Development Frameworks dita.metadata.default.permissions = all -dita.metadata.default.publisher = Digia -dita.metadata.default.copyryear = 2013 -dita.metadata.default.copyrholder = Digia +dita.metadata.default.publisher = The Qt Company +dita.metadata.default.copyryear = 2015 +dita.metadata.default.copyrholder = The Qt Company dita.metadata.default.audience = programmer language = Cpp diff --git a/tools/qdoc3/test/standalone-eclipse-integration.qdocconf b/tools/qdoc3/test/standalone-eclipse-integration.qdocconf index d6dd9b6..691bf37 100644 --- a/tools/qdoc3/test/standalone-eclipse-integration.qdocconf +++ b/tools/qdoc3/test/standalone-eclipse-integration.qdocconf @@ -5,7 +5,7 @@ macro.TheEclipseIntegration = The Qt Eclipse Integration HTML.footer = "<p /><address><hr /><div align=\"center\">\n" \ "<table width=\"100%\" cellspacing=\"0\" border=\"0\"><tr class=\"address\">\n" \ - "<td width=\"30%\" align=\"left\">Copyright © 2014 Digia Plc and/or its subsidiary(-ies)</td>\n" \ + "<td width=\"30%\" align=\"left\">Copyright © 2015 The Qt Company Ltd.</td>\n" \ "<td width=\"40%\" align=\"center\"><a href=\"http://qt.nokia.com/doc/trademarks.html\">Trademarks</a></td>\n" \ "<td width=\"30%\" align=\"right\"><div align=\"right\">Qt Eclipse Integration 1.5.3</div></td>\n" \ "</tr></table></div></address>" diff --git a/util/qlalr/doc/qlalr.qdocconf b/util/qlalr/doc/qlalr.qdocconf index 8698528..db6bba7 100644 --- a/util/qlalr/doc/qlalr.qdocconf +++ b/util/qlalr/doc/qlalr.qdocconf @@ -59,7 +59,7 @@ HTML.postheader = "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0 HTML.footer = "<p /><address><hr /><div align=\"center\">\n" \ "<table width=\"100%\" cellspacing=\"0\" border=\"0\"><tr class=\"address\">\n" \ - "<td width=\"30%\" align=\"left\">Copyright © 2012 Digia Plc and/or its subsidiary(-ies)</td>\n" \ + "<td width=\"30%\" align=\"left\">Copyright © 2015 The Qt Company Ltd</td>\n" \ "<td width=\"40%\" align=\"center\"><a href=\"trademarks.html\">Trademarks</a></td>\n" \ "<td width=\"30%\" align=\"right\"><div align=\"right\">Qt \\version</div></td>\n" \ "</tr></table></div></address>" |