diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-05-20 13:24:30 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-05-20 13:24:30 (GMT) |
| commit | ba2cc78943678173d21a4339839e63d16fe774a9 (patch) | |
| tree | 691ac2916d5daf948cdac07bc4ef19d08f36cabd /tools/qdoc3/htmlgenerator.cpp | |
| parent | 8f47373e3795d7ec50387d5f1a771a59567bdaea (diff) | |
| parent | ef8cd7f2e68d6d34d70c3a12e82a67ed16b92b72 (diff) | |
| download | Qt-ba2cc78943678173d21a4339839e63d16fe774a9.zip Qt-ba2cc78943678173d21a4339839e63d16fe774a9.tar.gz Qt-ba2cc78943678173d21a4339839e63d16fe774a9.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'tools/qdoc3/htmlgenerator.cpp')
| -rw-r--r-- | tools/qdoc3/htmlgenerator.cpp | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp index 5495e34..dda2cf3 100644 --- a/tools/qdoc3/htmlgenerator.cpp +++ b/tools/qdoc3/htmlgenerator.cpp @@ -1801,6 +1801,21 @@ void HtmlGenerator::generateHeader(const QString& title, out() << " <title>" << shortVersion << protectEnc(title) << "</title>\n"; + out() << " <!--[if IE]>"; + out() << "<meta name=\"MSSmartTagsPreventParsing\" content=\"true\">"; + out() << "<meta http-equiv=\"imagetoolbar\" content=\"no\">"; + out() << "<![endif]-->"; + out() << "<!--[if lt IE 7]>"; + out() << "<link rel=\"stylesheet\" type=\"text/css\" href=\"style/style_ie6.css\">"; + out() << "<![endif]-->"; + out() << "<!--[if IE 7]>"; + out() << "<link rel=\"stylesheet\" type=\"text/css\" href=\"style/style_ie7.css\">"; + out() << "<![endif]-->"; + out() << "<!--[if IE 8]>"; + out() << "<link rel=\"stylesheet\" type=\"text/css\" href=\"style/style_ie8.css\">"; + out() << "<![endif]-->"; + + //out() << " <title>Qt Reference Documentation</title>"; out() << " <link rel=\"stylesheet\" type=\"text/css\" href=\"style/style.css\" />\n"; out() << " <script src=\"scripts/jquery.js\" type=\"text/javascript\"></script>\n"; @@ -2317,7 +2332,7 @@ void HtmlGenerator::generateCompactList(const Node *relative, QString commonPrefix) { const int NumParagraphs = 37; // '0' to '9', 'A' to 'Z', '_' - const int NumColumns = 2; // number of columns in the result + const int NumColumns = 3; // number of columns in the result if (classMap.isEmpty()) return; |