diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qdoc3/htmlgenerator.cpp | 8 | ||||
| -rw-r--r-- | tools/qdoc3/test/qt-html-templates.qdocconf | 12 |
2 files changed, 5 insertions, 15 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: diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf index e6eea3b..99fd31a 100644 --- a/tools/qdoc3/test/qt-html-templates.qdocconf +++ b/tools/qdoc3/test/qt-html-templates.qdocconf @@ -175,14 +175,4 @@ HTML.footer = "" \ " </form>\n" \ " </div>\n" \ " <div id=\"blurpage\">\n" \ - " </div>\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" + " </div>\n" |