summaryrefslogtreecommitdiffstats
path: root/doc/global/qt-module-defaults-offline.qdocconf
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@digia.com>2015-10-20 10:36:57 +0200
committerTopi Reiniƶ <topi.reinio@digia.com>2015-10-21 08:15:35 +0000
commit04fe7af33fdb3c50171b769baa43195e2613a802 (patch)
treef611fa7f24d3aa57ddfd8c0bad7be80fd604188f /doc/global/qt-module-defaults-offline.qdocconf
parentfff3101bc6bbb2f8433c7edde80f77b6efb0ec39 (diff)
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 <martin.smith@digia.com>
Diffstat (limited to 'doc/global/qt-module-defaults-offline.qdocconf')
-rw-r--r--doc/global/qt-module-defaults-offline.qdocconf5
1 files changed, 1 insertions, 4 deletions
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)