diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-03-27 16:49:14 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-03-28 06:45:51 +0000 |
| commit | 1e1c21209005a7f8e8f604013095af5007cc2905 (patch) | |
| tree | 2e2ed623d8d8348547fccb534c1b369995aab0ca | |
| parent | 3616725049f0d7d695e2971b578361231bbca167 (diff) | |
| download | qt-creator-1e1c21209005a7f8e8f604013095af5007cc2905.tar.gz | |
Use QTCREATOR_COPYRIGHT_YEAR for documentation
For this the offline style overwrites any footer that was set in the
qt-html-templates-offline.qdocconf from Qt.
Change-Id: I8a8f7048445bc03a72b19df6c60b7cea680c5803
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| -rw-r--r-- | doc/qtcreator-online.qdocconf | 2 | ||||
| -rw-r--r-- | doc/qtcreator.qdocconf | 20 | ||||
| -rw-r--r-- | docs.pri | 4 |
3 files changed, 24 insertions, 2 deletions
diff --git a/doc/qtcreator-online.qdocconf b/doc/qtcreator-online.qdocconf index 91b77a0de7..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> 2018 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" \ + @@ -15,7 +15,9 @@ qdocindex.name = QDOC_INDEX_DIR qdocindex.value = $$[QT_INSTALL_DOCS] qtcdocsdir.name = QTC_DOCS_DIR qtcdocsdir.value = $$IDE_SOURCE_TREE/doc -QDOC_ENV += qtcver qtcvertag qtdocs qdocindex qtcdocsdir +qtccopyrightyear.name = QTCREATOR_COPYRIGHT_YEAR +qtccopyrightyear.value = $$QTCREATOR_COPYRIGHT_YEAR +QDOC_ENV += qtcver qtcvertag qtdocs qdocindex qtcdocsdir qtccopyrightyear DOC_INDEX_PATHS += $$IDE_BUILD_TREE/doc DOC_HTML_INSTALLDIR = $$INSTALL_DOC_PATH |