From 04fe7af33fdb3c50171b769baa43195e2613a802 Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Tue, 20 Oct 2015 10:36:57 +0200 Subject: Doc: Improve selection of offline template type 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 --- doc/global/qt-module-defaults-offline.qdocconf | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'doc/global/qt-module-defaults-offline.qdocconf') diff --git a/doc/global/qt-module-defaults-offline.qdocconf b/doc/global/qt-module-defaults-offline.qdocconf index 36874e8fc1..ee9557fe5c 100644 --- a/doc/global/qt-module-defaults-offline.qdocconf +++ b/doc/global/qt-module-defaults-offline.qdocconf @@ -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) -- cgit v1.2.3