diff options
author | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-07-08 11:35:27 +0200 |
---|---|---|
committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-07-16 17:55:24 +1000 |
commit | 79208954f33269f337ab386554d5c43bc82c872a (patch) | |
tree | 592f4f6b2a16953fa3c25bc3a9b252c5e5323c23 /tools | |
parent | f6221adff4c3a154f22ee23705b6f76832421a81 (diff) |
Doc: more cleaning
(cherry picked from commit 25ace9513587abb5e52f78d900e6bec7b04bb663)
Diffstat (limited to 'tools')
-rw-r--r-- | tools/qdoc3/htmlgenerator.cpp | 27 |
1 files changed, 3 insertions, 24 deletions
diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp index ed177f2413..55214c3c8e 100644 --- a/tools/qdoc3/htmlgenerator.cpp +++ b/tools/qdoc3/htmlgenerator.cpp @@ -1771,8 +1771,8 @@ void HtmlGenerator::generateHeader(const QString& title, out() << " <script src=\"scripts/functions.js\" type=\"text/javascript\"></script>\n"; // Adding style and js for small windows out() << " <script src=\"./scripts/superfish.js\" type=\"text/javascript\"></script>\n"; - out() << " <script src=\"./scripts/narrow.js\" type=\"text/javascript\"></script>\n"; out() << " <link rel=\"stylesheet\" type=\"text/css\" href=\"style/superfish.css\" />"; + out() << " <script src=\"./scripts/narrow.js\" type=\"text/javascript\"></script>\n"; out() << " <link rel=\"stylesheet\" type=\"text/css\" href=\"style/narrow.css\" />"; // Adding syntax highlighter // future release @@ -1780,32 +1780,14 @@ void HtmlGenerator::generateHeader(const QString& title, // Setting assistant configuration if (offlineDocs) { - out() << " <link rel=\"stylesheet\" type=\"text/css\" href=\"style/style.css\" />"; // Style common to all browsers - // out() << " <link rel=\"stylesheet\" type=\"text/css\" href=\"style/OfflineStyle.css\" />"; // Only for Qt Creator + // out() << " <link rel=\"stylesheet\" type=\"text/css\" href=\"style/CreatorStyle.css\" />"; // Only for Qt Creator out() << "</head>\n"; out() << "<body class=\"offline narrow\">\n"; // narrow mainly for Creator - out() << "</head>\n"; - out() << "<body class=\"offline narrow\" >\n"; // narrow mainly for Creator -// out() << " <script src=\"scripts/functions.js\" type=\"text/javascript\"></script>\n"; } // Setting online doc configuration else { - out() << " <link rel=\"stylesheet\" type=\"text/css\" href=\"style/style.css\"\n />"; - // out() << " <!--[if IE]>\n"; - // out() << "<meta name=\"MSSmartTagsPreventParsing\" content=\"true\">\n"; - // out() << "<meta http-equiv=\"imagetoolbar\" content=\"no\">\n"; - // out() << "<![endif]-->\n"; - // out() << "<!--[if lt IE 7]>\n"; - // out() << "<link rel=\"stylesheet\" type=\"text/css\" href=\"style/style_ie6.css\">\n"; - // out() << "<![endif]-->\n"; - // out() << "<!--[if IE 7]>\n"; - // out() << "<link rel=\"stylesheet\" type=\"text/css\" href=\"style/style_ie7.css\">\n"; - // out() << "<![endif]-->\n"; - // out() << "<!--[if IE 8]>\n"; - // out() << "<link rel=\"stylesheet\" type=\"text/css\" href=\"style/style_ie8.css\">\n"; - // out() << "<![endif]-->\n"; - // Custom browser styles + // Browser spec styles out() << " <!--[if IE]>\n"; out() << "<meta name=\"MSSmartTagsPreventParsing\" content=\"true\">\n"; out() << "<meta http-equiv=\"imagetoolbar\" content=\"no\">\n"; @@ -1821,9 +1803,6 @@ void HtmlGenerator::generateHeader(const QString& title, out() << "<![endif]-->\n"; out() << "</head>\n"; - out() << "<body class=\"\" onload=\"CheckEmptyAndLoadList();\">\n"; // CheckEmptyAndLoadList() activating online search - - out() << "</head>\n"; // CheckEmptyAndLoadList activating search out() << "<body class=\"\" onload=\"CheckEmptyAndLoadList();\">\n"; } |