diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-19 00:35:19 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-19 00:35:19 (GMT) |
| commit | 0cb57328453c476b01b058d57211afee197d6a82 (patch) | |
| tree | 87f58d0ba221606701c888db2a5f2262cc384cf8 /tools/qdoc3/test/qt-html-templates-online.qdocconf | |
| parent | ff7f7dd596511de4c629b6c7f97d32a21049bb95 (diff) | |
| parent | 7efd63b1ad26090ec15e1ab7bd9c60fa1c12e98a (diff) | |
| download | Qt-0cb57328453c476b01b058d57211afee197d6a82.zip Qt-0cb57328453c476b01b058d57211afee197d6a82.tar.gz Qt-0cb57328453c476b01b058d57211afee197d6a82.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging:
Doc: Fixed qdoc warnings.
Doc: Fixed qdoc warnings.
Improved comment finding code.
Added language information to the pure documentation parser.
Doc: Fixes to Qt tutorial
Fixed external link to DevNet Wiki.
qdoc: Fixed a crash caused by accessing a null pointer.
Doc: Fixed the example of an encoded URL in the class description.
Doc: Added a copy of the online style images for the qdoc manual.
Doc: Removed the Google Analytics script.
Diffstat (limited to 'tools/qdoc3/test/qt-html-templates-online.qdocconf')
| -rw-r--r-- | tools/qdoc3/test/qt-html-templates-online.qdocconf | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/tools/qdoc3/test/qt-html-templates-online.qdocconf b/tools/qdoc3/test/qt-html-templates-online.qdocconf index 03ed6fa..3584b68 100644 --- a/tools/qdoc3/test/qt-html-templates-online.qdocconf +++ b/tools/qdoc3/test/qt-html-templates-online.qdocconf @@ -181,16 +181,4 @@ HTML.footer = \ " <div id=\"blurpage\">\n" \ " </div>\n" \ "\n" \ - " <script src=\"scripts/functions.js\" type=\"text/javascript\"></script>\n" \ - " <script type=\"text/javascript\">\n" \ - " var _gaq = _gaq || [];\n" \ - " _gaq.push(['_setAccount', 'UA-4457116-5']);\n" \ - " _gaq.push(['_trackPageview']);\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" \ - " </script>\n" + " <script src=\"scripts/functions.js\" type=\"text/javascript\"></script>\n" |