diff options
| author | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-09-16 11:22:26 (GMT) |
|---|---|---|
| committer | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-09-16 11:22:26 (GMT) |
| commit | 8dcaaca317bf2aa399343ad729d85cd8e49ed997 (patch) | |
| tree | a42952b3567df5892c313a261b83c6acbbff5886 /tools/qdoc3 | |
| parent | 5da0667acb5bb025906183304a7bafafd36a3c8c (diff) | |
| parent | aca8e97cfa7fd443d936079faa1ff3624ac17e50 (diff) | |
| download | Qt-8dcaaca317bf2aa399343ad729d85cd8e49ed997.zip Qt-8dcaaca317bf2aa399343ad729d85cd8e49ed997.tar.gz Qt-8dcaaca317bf2aa399343ad729d85cd8e49ed997.tar.bz2 | |
Merge branch '13092010doc' into doc-4.7
Conflicts:
tools/qdoc3/test/qt-html-templates.qdocconf
Diffstat (limited to 'tools/qdoc3')
| -rw-r--r-- | tools/qdoc3/htmlgenerator.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp index 5934319..77e306a 100644 --- a/tools/qdoc3/htmlgenerator.cpp +++ b/tools/qdoc3/htmlgenerator.cpp @@ -943,10 +943,10 @@ int HtmlGenerator::generateAtom(const Atom *atom, } } else { - out() << "<ol type="; + out() << "<ol class="; if (atom->string() == ATOM_LIST_UPPERALPHA) { out() << "\"A\""; - } /* why type? */ + } /* why type? changed to */ else if (atom->string() == ATOM_LIST_LOWERALPHA) { out() << "\"a\""; } @@ -1966,7 +1966,7 @@ void HtmlGenerator::generateFooter(const Node *node) switch (application) { case Online: out() << " <script src=\"scripts/functions.js\" type=\"text/javascript\"></script>\n"; - out() << " <!-- <script type=\"text/javascript\">\n"; + out() << " <script type=\"text/javascript\">\n"; out() << " var _gaq = _gaq || [];\n"; out() << " _gaq.push(['_setAccount', 'UA-4457116-5']);\n"; out() << " _gaq.push(['_trackPageview']);\n"; @@ -1977,7 +1977,7 @@ void HtmlGenerator::generateFooter(const Node *node) out() << "'.google-analytics.com/ga.js';\n"; out() << " var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);\n"; out() << " })();\n"; - out() << " </script> -->\n"; + out() << " </script>\n"; out() << "</body>\n"; break; case Creator: |