diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-12-10 07:58:06 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-12-10 07:58:06 +0100 |
| commit | 015002fec9abff6a4c1bb3fa4b9de87279a079c3 (patch) | |
| tree | ad93af535a503d0a49d6c6367e990a8fbca163d3 /doc/global/qt-module-defaults-online.qdocconf | |
| parent | f1e00262321cc8daa3c7506153653453e2779886 (diff) | |
| parent | b9547af45ea2bbbc634722c1ef41afdb54216ce2 (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
doc/global/template/style/online.css
mkspecs/android-g++/qmake.conf
Change-Id: Ib39ea7bd42f5ae12e82a3bc59a66787a16bdfc61
Diffstat (limited to 'doc/global/qt-module-defaults-online.qdocconf')
| -rw-r--r-- | doc/global/qt-module-defaults-online.qdocconf | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/doc/global/qt-module-defaults-online.qdocconf b/doc/global/qt-module-defaults-online.qdocconf index 258295b4f9..fcff1976d1 100644 --- a/doc/global/qt-module-defaults-online.qdocconf +++ b/doc/global/qt-module-defaults-online.qdocconf @@ -1,7 +1,20 @@ #The online onfiguration for a Qt 5 module, including Add-Ons and Tools. -#Online version contains a different header. #Include this file for a standard Qt 5 module; builds with the online style. +# Start of footer - the rest is defined in qt-html-templates-online.qdocconf +HTML.footer = \ + " </div>\n" \ + " <p class=\"copy-notice\">\n" \ + " <acronym title=\"Copyright\">©</acronym> 2014 Digia Plc and/or its\n" \ + " subsidiaries. Documentation contributions included herein are the copyrights of\n" \ + " their respective owners. " \ + " 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. " \ + " Digia, Qt and their respective logos are trademarks of Digia Plc " \ + " in Finland and/or other countries worldwide. All other trademarks are property\n" \ + " of their respective owners. </p>\n" + #include standard set of macros and C++ defines and ignores include(macros.qdocconf) include(qt-cpp-defines.qdocconf) @@ -12,3 +25,7 @@ include(qt-html-templates-online.qdocconf) #extra configuration data DITA information include(config.qdocconf) + +# single-directory output mode +HTML.nosubdirs = "true" +HTML.outputsubdir = "html" |