Merge remote-tracking branch 'origin/5.4.0' into 5.4

Change-Id: I0cd11cbe95693b78450ea81a0187760f4a6a8b5f

1 files changed, 29 insertions, 0 deletions

diff --git a/doc/global/qt-module-defaults-online-commercial.qdocconf b/doc/global/qt-module-defaults-online-commercial.qdocconf
new file mode 100644
index 0000000000..23b0998ccb
--- /dev/null
+++ b/doc/global/qt-module-defaults-online-commercial.qdocconf
@@ -0,0 +1,29 @@
+# This template uses the default online template for qt.io
+# and modifies it for a commercial Qt component
+
+# Start of footer - the rest is defined in the default template
+HTML.footer = \
+    "  <p class=\"qt_commercial\">Available under certain Qt licenses.<br/><a href=\"http://www.qt.io/download/\">Find out more.</a></p>\n" \
+    "  </div>\n"
+
+include(macros.qdocconf)
+include(qt-cpp-defines.qdocconf)
+include(compat.qdocconf)
+#include(manifest-meta.qdocconf)
+include(fileextensions.qdocconf)
+include(qt-html-templates-online.qdocconf)
+
+#extra configuration data DITA information
+include(config.qdocconf)
+
+HTML.prologue = \
+    "<div class=\"context qt_commercial\">\n" \
+    "<a href=\"http://www.qt.io/download/\" title=\"Available under certain Qt licenses.\" ><h1 class=\"qt_commercial\">C</h1></a>\n"
+
+# Turn off single-directory output mode
+HTML.nosubdirs = "false"
+
+# Set navigation homepage
+navigation.homepage = "Qt Documentation"
+
+sourcedirs += includes-online