diff options
| author | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2015-01-28 11:22:37 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2015-01-28 11:22:37 +0100 |
| commit | db46956af0862a6595f068df553004e53df5f5d6 (patch) | |
| tree | b9b59b7f74c2232b8c10b04a923130726310c931 /doc/config | |
| parent | 10b00e5c63af399775a7d1b2da3ea8df807eee98 (diff) | |
| parent | d4010ce842360d0fa5ba67f8dcb3267aae49092c (diff) | |
Merge branch '1.3' into 'master'
Conflicts:
doc/reference/jsextensions/jsextensions-general.qdoc
src/lib/corelib/language/evaluatorscriptclass.cpp
src/lib/corelib/language/evaluatorscriptclass.h
Change-Id: Ic9b77b56e8fc8bf93e0a553930757de8c93fed22
Diffstat (limited to 'doc/config')
| -rw-r--r-- | doc/config/qt-html-templates.qdocconf | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/config/qt-html-templates.qdocconf b/doc/config/qt-html-templates.qdocconf index bd9bcaeb8..9d82754f4 100644 --- a/doc/config/qt-html-templates.qdocconf +++ b/doc/config/qt-html-templates.qdocconf @@ -24,8 +24,8 @@ HTML.footer = \ "</div> \n" \ "<div class=\"footer\">\n" \ " <p>\n" \ - " <acronym title=\"Copyright\">©</acronym> 2008-2014 Digia Plc and/or its\n" \ - " subsidiaries. Digia, Qt and their respective logos are trademarks of Digia Corporation \n" \ + " <acronym title=\"Copyright\">©</acronym> 2008-2015 The Qt Company Ltd.\n" \ + " Qt and 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" \ @@ -34,7 +34,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" \ |