From b5d5437ae221ad97ae78ecc484bf26a585402f65 Mon Sep 17 00:00:00 2001
From: Jerome Pasion <jerome.pasion@digia.com>
Date: Fri, 21 Sep 2012 13:40:26 +0200
Subject: Doc: Updated doc templates in doc/global

Task-number: QTBUG-27293
Change-Id: I37bb8ceb958d12d3670eb9db920078a585578721
Reviewed-by: Martin Smith <martin.smith@digia.com>
---
 doc/global/qt-html-templates-offline.qdocconf | 17 +++++++++++++++--
 doc/global/qt-module-defaults.qdocconf        | 13 +++++++++++++
 2 files changed, 28 insertions(+), 2 deletions(-)

(limited to 'doc/global')

diff --git a/doc/global/qt-html-templates-offline.qdocconf b/doc/global/qt-html-templates-offline.qdocconf
index 7c7810a1e7..135d0ab915 100644
--- a/doc/global/qt-html-templates-offline.qdocconf
+++ b/doc/global/qt-html-templates-offline.qdocconf
@@ -1,6 +1,20 @@
+#
+#  W A R N I N G
+#  -------------
+#
+# A common HTML template for modules in this repository.
+# This template is common among the Qt 5 modules.
+#
+# A change in this template must be replicated in all of the repositories.
+#
+# We mean it.
+#
+
+HTML.templatedir = ../../../doc
+
 HTML.nobreadcrumbs      = "true"
 
-HTML.stylesheets = ../../../doc/global/style/offline.css
+HTML.stylesheets = global/style/offline.css
 
 HTML.headerstyles = \
     "  <link rel=\"stylesheet\" type=\"text/css\" href=\"style/offline.css\" />\n"
@@ -29,4 +43,3 @@ HTML.footer = \
     "      of their respective owners. <a title=\"Privacy Policy\"\n" \
     "      href=\"http://en.gitorious.org/privacy_policy/\">Privacy Policy</a></p>\n" \
     "</div>\n" \
-
diff --git a/doc/global/qt-module-defaults.qdocconf b/doc/global/qt-module-defaults.qdocconf
index 4b7755be13..48e9ae7893 100644
--- a/doc/global/qt-module-defaults.qdocconf
+++ b/doc/global/qt-module-defaults.qdocconf
@@ -1,3 +1,15 @@
+#
+#  W A R N I N G
+#  -------------
+#
+# A common template for modules in this repository.
+# This template is common among the Qt 5 modules.
+#
+# A change in this template must be replicated in all of the repositories.
+#
+# We mean it.
+#
+
 codeindent              = 1
 
 Cpp.ignoretokens        = \
@@ -33,6 +45,7 @@ Cpp.ignoretokens        = \
                           Q_OPENGL_EXPORT \
                           Q_OPENVG_EXPORT \
                           Q_OUTOFLINE_TEMPLATE \
+                          Q_PRINTSUPPORT_EXPORT \
                           Q_SQL_EXPORT \
                           Q_SVG_EXPORT \
                           Q_SCRIPT_EXPORT \
-- 
cgit v1.2.3