feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Update the footer for qdoc output for qt-project.

Browse Source 
Change-Id: I7861fffebd07cab497faa71541117a1d686a5d60
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
This commit is contained in:
Casper van Donderen
2012-03-13 16:40:01 +01:00
parent 9bf9474e8d
commit 4ef89ffa03
2 changed files with 32 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
doc/config/qt-html-templates-online.qdocconf
View File

@@ -105,21 +105,24 @@ HTML.footer = \
" </div> \n" \ " </div> \n" \
" <div class=\"footer\">\n" \ " <div class=\"footer\">\n" \
" <p>\n" \ " <p>\n" \
" <acronym title=\"Copyright\">&copy;</acronym> 2008-2012 Nokia Corporation and/or its\n" \
" subsidiaries. Nokia, Qt and their respective logos are trademarks of Nokia Corporation \n" \
" in Finland and/or other countries worldwide.</p>\n" \
" <p>\n" \ " <p>\n" \
" All other trademarks are property of their respective owners. <a title=\"Privacy Policy\"\n" \ " <acronym title=\"Copyright\">&copy;</acronym> 2012 Nokia Corporation and/or its\n" \
" href=\"http://qt.nokia.com/about/privacy-policy\">Privacy Policy</a></p>\n" \ " subsidiaries. Documentation contributions included herein are the copyrights of\n" \
" their respective owners.</p>\n" \
" <br />\n" \ " <br />\n" \
" <p>\n" \ " <p>\n" \
" Licensees holding valid Qt Commercial licenses may use this document in accordance with the" \ " The documentation provided herein is licensed under the terms of the\n" \
" Qt Commercial License Agreement provided with the Software or, alternatively, in accordance" \ " <a href=\"http://www.gnu.org/licenses/fdl.html\">GNU Free Documentation\n" \
" with the terms contained in a written agreement between you and Nokia.</p>\n" \ " License version 1.3</a> as published by the Free Software Foundation.</p>\n" \
" <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" \ " Documentation sources may be obtained from <a href=\"http://www.qt-project.org\">\n" \
" Free Documentation License version 1.3</a>\n" \ " www.qt-project.org</a>.</p>\n" \
" as published by the Free Software Foundation.</p>\n" \ " <br />\n" \
" <p>\n" \
" Nokia, Qt and their respective logos are trademarks of Nokia Corporation \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" \
" </div>\n" \ " </div>\n" \
"\n" \ "\n" \
" <script src=\"scripts/functions.js\" type=\"text/javascript\"></script>\n" \ " <script src=\"scripts/functions.js\" type=\"text/javascript\"></script>\n" \

34
doc/config/qt-html-templates.qdocconf
View File

@@ -23,22 +23,24 @@ HTML.footer = \
" </div>\n" \ " </div>\n" \
"</div> \n" \ "</div> \n" \
"<div class=\"footer\">\n" \ "<div class=\"footer\">\n" \
" <p>\n" \ " <p>\n" \
" <acronym title=\"Copyright\">&copy;</acronym> 2008-2012 Nokia Corporation and/or its\n" \ " <acronym title=\"Copyright\">&copy;</acronym> 2012 Nokia Corporation and/or its\n" \
" subsidiaries. Nokia, Qt and their respective logos are trademarks of Nokia Corporation \n" \ " subsidiaries. Documentation contributions included herein are the copyrights of\n" \
" in Finland and/or other countries worldwide.</p>\n" \ " their respective owners.</p>\n" \
" <p>\n" \ " <br />\n" \
" All other trademarks are property of their respective owners. <a title=\"Privacy Policy\"\n" \ " <p>\n" \
" href=\"http://qt.nokia.com/about/privacy-policy\">Privacy Policy</a></p>\n" \ " The documentation provided herein is licensed under the terms of the\n" \
" <br />\n" \ " <a href=\"http://www.gnu.org/licenses/fdl.html\">GNU Free Documentation\n" \
" <p>\n" \ " License version 1.3</a> as published by the Free Software Foundation.</p>\n" \
" Licensees holding valid Qt Commercial licenses may use this document in accordance with the" \ " <p>\n" \
" Qt Commercial License Agreement provided with the Software or, alternatively, in accordance" \ " Documentation sources may be obtained from <a href=\"http://www.qt-project.org\">\n" \
" with the terms contained in a written agreement between you and Nokia.</p>\n" \ " www.qt-project.org</a>.</p>\n" \
" <p>\n" \ " <br />\n" \
" Alternatively, this document may be used under the terms of the <a href=\"http://www.gnu.org/licenses/fdl.html\">GNU\n" \ " <p>\n" \
" Free Documentation License version 1.3</a>\n" \ " Nokia, Qt and their respective logos are trademarks of Nokia Corporation \n" \
" as published by the Free Software Foundation.</p>\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" \
"</div>\n" \ "</div>\n" \
# Files not referenced in any qdoc file. # Files not referenced in any qdoc file.