summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJerome Pasion <jerome.pasion@digia.com>2013-09-19 14:39:49 +0200
committerJerome Pasion <jerome.pasion@digia.com>2013-09-23 12:11:48 +0200
commit0c1cf492a6bfd0d34b2411a75231ec89bbadf069 (patch)
tree65e1fe58dedc3d8f308c2eeb69bc671ab8471585
parent5690654e3444d0c9d7492263b105432943784d37 (diff)
doc-snapshot: removed nosubdir template
-moved the important part into the main template Change-Id: I843cdecec3e7d0396d38e7d978fd1bac5f4590f7 Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
-rw-r--r--doc-snapshot/templates/qt-html-templates-snapshot-nosubdir.qdocconf44
-rw-r--r--doc-snapshot/templates/qt-html-templates-snapshot.qdocconf3
2 files changed, 3 insertions, 44 deletions
diff --git a/doc-snapshot/templates/qt-html-templates-snapshot-nosubdir.qdocconf b/doc-snapshot/templates/qt-html-templates-snapshot-nosubdir.qdocconf
deleted file mode 100644
index ef903d6..0000000
--- a/doc-snapshot/templates/qt-html-templates-snapshot-nosubdir.qdocconf
+++ /dev/null
@@ -1,44 +0,0 @@
-#include standard set of HTML header and footer.
-include(html-config.qdocconf)
-include(html-header-online.qdocconf)
-include(html-footer.qdocconf)
-
-#uncomment if navigation bar is not wanted
-#HTML.nonavigationbar = "true"
-
-HTML.stylesheets = template/style/online.css
-HTML.extraimages += template/images/ico_out.png \
- template/images/ico_note.png \
- template/images/ico_note_attention.png \
- template/images/btn_prev.png \
- template/images/btn_next.png \
- template/images/bullet_dn.png \
- template/images/bullet_sq.png \
- template/images/bgrContent.png \
- template/images/Qt-logo.png \
- template/images/Qt-dark_gradient.png \
- template/images/Qt-footer-bg.jpg \
- template/images/Qt-footer_shadow.png \
- template/images/Qt-gradient.png \
- template/images/Qt-header-bg.jpg
-
-#Google Analytics script
-HTML.headerscripts = \
- "<script src=\"scripts/superfish.js\" type=\"text/javascript\"></script>\n" \
- "<script src=\"scripts/narrow.js\" type=\"text/javascript\"></script>\n\n" \
- "<script type=\"text/javascript\">\n" \
- " \n" \
- " var _gaq = _gaq || [];\n" \
- " _gaq.push(['_setAccount', 'UA-35529873-1']);\n" \
- " _gaq.push(['_trackPageview']);\n" \
- " \n" \
- " (function() {\n" \
- " var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;\n" \
- " ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';\n" \
- " var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);\n" \
- " })();\n" \
- " \n" \
- "</script>\n\n" \
-
-HTML.nosubdirs = "true"
-HTML.outputsubdir = "html"
diff --git a/doc-snapshot/templates/qt-html-templates-snapshot.qdocconf b/doc-snapshot/templates/qt-html-templates-snapshot.qdocconf
index a733ed9..ef903d6 100644
--- a/doc-snapshot/templates/qt-html-templates-snapshot.qdocconf
+++ b/doc-snapshot/templates/qt-html-templates-snapshot.qdocconf
@@ -39,3 +39,6 @@ HTML.headerscripts = \
" })();\n" \
" \n" \
"</script>\n\n" \
+
+HTML.nosubdirs = "true"
+HTML.outputsubdir = "html"