diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-03-28 10:01:44 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-03-28 10:01:44 +0200 |
| commit | 5cc24f9ac13cb2df1afd7cc73f1243d601e1baa5 (patch) | |
| tree | 425c7d1fe5ebfa42e5ccbf210ca6bc9d7e605e8c /doc | |
| parent | de4f6301e6658b05d5cb6b84d12776eb3cab4ab3 (diff) | |
| parent | 1e1c21209005a7f8e8f604013095af5007cc2905 (diff) | |
Merge remote-tracking branch 'origin/4.6'
Conflicts:
src/plugins/projectexplorer/msvctoolchain.cpp
Change-Id: If2116aa2dbfdb9d07088595e791f8fa706b39e00
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/qtcreator-online.qdocconf | 2 | ||||
| -rw-r--r-- | doc/qtcreator.qdocconf | 20 |
2 files changed, 21 insertions, 1 deletions
diff --git a/doc/qtcreator-online.qdocconf b/doc/qtcreator-online.qdocconf index 7d54136d41..2a0ace2312 100644 --- a/doc/qtcreator-online.qdocconf +++ b/doc/qtcreator-online.qdocconf @@ -4,7 +4,7 @@ include(config/qtcreator-project.qdocconf) HTML.footer = \ " </div>\n" \ " <p class=\"copy-notice\">\n" \ - " <acronym title=\"Copyright\">©</acronym> 2017 The Qt Company Ltd.\n" \ + " <acronym title=\"Copyright\">©</acronym> $QTCREATOR_COPYRIGHT_YEAR The Qt Company Ltd.\n" \ " Documentation contributions included herein are the copyrights of\n" \ " their respective owners. " \ " The documentation provided herein is licensed under the terms of the" \ diff --git a/doc/qtcreator.qdocconf b/doc/qtcreator.qdocconf index b31381f962..9ebd93b019 100644 --- a/doc/qtcreator.qdocconf +++ b/doc/qtcreator.qdocconf @@ -1,3 +1,23 @@ # Run qdoc from the directory that contains this file. include(config/qtcreator-project.qdocconf) include($QT_INSTALL_DOCS/global/qt-html-templates-offline.qdocconf) + +HTML.footer = \ + " </div>\n" \ + " </div>\n" \ + " </div>\n" \ + " </div>\n" \ + "</div>\n" \ + "<div class=\"footer\">\n" \ + " <p>\n" \ + " <acronym title=\"Copyright\">©</acronym> $QTCREATOR_COPYRIGHT_YEAR The Qt Company Ltd.\n" \ + " Documentation contributions included herein are the copyrights of\n" \ + " their respective owners.<br>" \ + " The documentation provided herein is licensed under the terms of the" \ + " <a href=\"http://www.gnu.org/licenses/fdl.html\">GNU Free Documentation" \ + " License version 1.3</a> as published by the Free Software Foundation.<br>" \ + " Qt and respective logos are trademarks of The Qt Company Ltd. " \ + " in Finland and/or other countries worldwide. All other trademarks are property\n" \ + " of their respective owners. </p>\n" \ + "</div>\n" \ + |