diff options
| author | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-07-08 09:17:16 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-07-16 07:55:15 (GMT) |
| commit | f6221adff4c3a154f22ee23705b6f76832421a81 (patch) | |
| tree | 2f5ad3b47b610dd5251290af545e0c8b9cc974fe /tools/qdoc3/htmlgenerator.cpp | |
| parent | 67d7bf08c8adbb7a33c4ed76629a72e2c6ae00ac (diff) | |
| download | Qt-f6221adff4c3a154f22ee23705b6f76832421a81.zip Qt-f6221adff4c3a154f22ee23705b6f76832421a81.tar.gz Qt-f6221adff4c3a154f22ee23705b6f76832421a81.tar.bz2 | |
Doc: cleaning html generator
(cherry picked from commit 5a6e3d952327753cb0cc00fa22804c5dab435c39)
Diffstat (limited to 'tools/qdoc3/htmlgenerator.cpp')
| -rw-r--r-- | tools/qdoc3/htmlgenerator.cpp | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp index a50e08a..ed177f2 100644 --- a/tools/qdoc3/htmlgenerator.cpp +++ b/tools/qdoc3/htmlgenerator.cpp @@ -1780,23 +1780,17 @@ void HtmlGenerator::generateHeader(const QString& title, // Setting assistant configuration if (offlineDocs) { -<<<<<<< Updated upstream:tools/qdoc3/htmlgenerator.cpp 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() << "</head>\n"; out() << "<body class=\"offline narrow\">\n"; // narrow mainly for Creator - out() << " <script src=\"scripts/jquery.js\" type=\"text/javascript\"></script>\n"; - out() << " <script src=\"scripts/functions.js\" type=\"text/javascript\"></script>\n"; -======= out() << "</head>\n"; out() << "<body class=\"offline narrow\" >\n"; // narrow mainly for Creator // out() << " <script src=\"scripts/functions.js\" type=\"text/javascript\"></script>\n"; ->>>>>>> Stashed changes:tools/qdoc3/htmlgenerator.cpp } // Setting online doc configuration else { -<<<<<<< Updated upstream:tools/qdoc3/htmlgenerator.cpp out() << " <link rel=\"stylesheet\" type=\"text/css\" href=\"style/style.css\"\n />"; // out() << " <!--[if IE]>\n"; // out() << "<meta name=\"MSSmartTagsPreventParsing\" content=\"true\">\n"; @@ -1811,7 +1805,6 @@ void HtmlGenerator::generateHeader(const QString& title, // out() << "<!--[if IE 8]>\n"; // out() << "<link rel=\"stylesheet\" type=\"text/css\" href=\"style/style_ie8.css\">\n"; // out() << "<![endif]-->\n"; -======= // Custom browser styles out() << " <!--[if IE]>\n"; out() << "<meta name=\"MSSmartTagsPreventParsing\" content=\"true\">\n"; @@ -1826,32 +1819,13 @@ void HtmlGenerator::generateHeader(const QString& title, out() << "<!--[if IE 8]>\n"; out() << "<link rel=\"stylesheet\" type=\"text/css\" href=\"style/style_ie8.css\">\n"; out() << "<![endif]-->\n"; ->>>>>>> Stashed changes:tools/qdoc3/htmlgenerator.cpp - // jquery functions - // menus and small docs js and css -<<<<<<< Updated upstream:tools/qdoc3/htmlgenerator.cpp - // 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() << " <link rel=\"stylesheet\" type=\"text/css\" href=\"style/narrow.css\" />"; - - // syntax highlighter js and css - // out() << " <link type=\"text/css\" rel=\"stylesheet\" href=\"style/shCore.css\"/>\n"; - // out() << " <link type=\"text/css\" rel=\"stylesheet\" href=\"style/shThemeDefault.css\"/>\n"; - // out() << " <script type=\"text/javascript\" src=\"scripts/shCore.js\"></script>\n"; - // out() << " <script type=\"text/javascript\" src=\"scripts/shBrushCpp.js\"></script>\n"; - // out() << " <script type=\"text/javascript\">\n"; - // out() << " SyntaxHighlighter.all();\n"; - // out() << " </script>\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"; ->>>>>>> Stashed changes:tools/qdoc3/htmlgenerator.cpp } #ifdef GENERATE_MAC_REFS |