AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Doc: Improve selection of offline template type

Browse Source 
Qt 5.6 now includes a version of the offline documentation template
with simplified CSS suited for rendering HTML with a QTextBrowser
backend.

Select the template in qt-html-templates-offline.qdocconf, instead
of the higher-level qt-module-defaults-offline.qdocconf. This is
better because many projects external to qt5 (including Qt Creator)
do not use qt-module-* includes. This way, we can control the
template selection for all projects from a config file.

Change-Id: I766af422d829f3c9519c5a45093473175363d600
Reviewed-by: Martin Smith <martin.smith@digia.com>
This commit is contained in:
Topi Reinio 2015-10-20 10:36:57 +02:00 committed by Topi Reiniö
parent fff3101bc6
commit 04fe7af33f
3 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
doc/global/qt-html-templates-offline-simple.qdocconf
View File

@ -1,16 +1,8 @@
#include standard set of HTML header and footer.
include(html-config.qdocconf)
include(html-header-offline.qdocconf)
include(html-footer.qdocconf)
# Uncomment if navigation bar is not wanted
#HTML.nonavigationbar = "true"
# Specify a custom CSS file used by this template
HTML.stylesheets += template/style/offline-simple.css
qhp.extraFiles += style/offline-simple.css
# override the header styles
# Override the header styles
HTML.headerstyles = \
" <link rel=\"stylesheet\" type=\"text/css\" href=\"style/offline-simple.css\" />\n" \
" <script type=\"text/javascript\">\n" \

5
doc/global/qt-html-templates-offline.qdocconf
View File

@ -26,3 +26,8 @@ qhp.extraFiles += style/offline.css \
images/bullet_dn.png \
images/bullet_sq.png \
images/bgrContent.png
# By default, include override definitions for a simplified template/CSS,
# suited for rendering HTML with QTextBrowser. Comment out this line to
# select the standard CSS.
include(qt-html-templates-offline-simple.qdocconf)

5
doc/global/qt-module-defaults-offline.qdocconf
View File

@ -8,10 +8,7 @@ include(compat.qdocconf)
include(manifest-meta.qdocconf)
include(fileextensions.qdocconf)
# By default, select the 'simple' offline template, suited for rendering
# HTML with QTextBrowser.
include(qt-html-templates-offline-simple.qdocconf)
#include(qt-html-templates-offline.qdocconf)
include(qt-html-templates-offline.qdocconf)
#extra configuration data such as file extensions
include(config.qdocconf)