Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (27 commits)
  Added default countries for Mongolian and Nepali.
  Updated tst_qlocale autotest.
  Updated the 4.7.0 change log with my changes.
  Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration to javascriptcore-snapshot-19052010 ( 8039ba79702d6516cf6841c9f15b324ec499bbf3 )
  doc: Fixed many broken links.
  doc: Fixed many broken links.
  doc: Fixed many broken links.
  qdoc: Set back to 3 cols for class list; we have a scrollbar now.
  Fix build on Mac OS X and Windows.
  Remove obsolete and broken qvfb skins.
  Only setup ICD test data when ICD is enabled.
  Doc: Fixed two diagrams and finally committed images for them.
  Make sure cursorPositionChanged is emitted when doing undo/redo
  Some more 4.7.0 changes
  Fix cosmetic issue in designer filter edits
  Doc: Adding support for IE 6, 7 and 8
  doc: Updated the widgets tutorial to work without page links.
  My 4.7.0 changes
  Added support for es_419 locale.
  Added Korean and Nynorsk locales support on Symbian.
  ...

10 files changed, 46 insertions, 3 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;
diff --git a/tools/qdoc3/test/assistant.qdocconf b/tools/qdoc3/test/assistant.qdocconf
index 112b1b2..3711ec4 100644
--- a/tools/qdoc3/test/assistant.qdocconf
+++ b/tools/qdoc3/test/assistant.qdocconf
@@ -36,6 +36,9 @@ qhp.Assistant.extraFiles          = 									images/bg_l.png \
                              	   images/dynamiclayouts-example.png \
 									scripts/functions.js \
 									scripts/jquery.js \
+									style/style_ie6.css \
+									style/style_ie7.css \
+									style/style_ie8.css \
                              	    style/style.css
 
 qhp.Assistant.filterAttributes    = qt 4.7.0 tools assistant
diff --git a/tools/qdoc3/test/designer.qdocconf b/tools/qdoc3/test/designer.qdocconf
index d4da292..39da68b 100644
--- a/tools/qdoc3/test/designer.qdocconf
+++ b/tools/qdoc3/test/designer.qdocconf
@@ -36,6 +36,9 @@ qhp.Designer.extraFiles          = images/bg_l.png \
                              	   images/dynamiclayouts-example.png \
 									scripts/functions.js \
 									scripts/jquery.js \
+									style/style_ie6.css \
+									style/style_ie7.css \
+									style/style_ie8.css \
                              	    style/style.css
 
 qhp.Designer.filterAttributes    = qt 4.7.0 tools designer
diff --git a/tools/qdoc3/test/linguist.qdocconf b/tools/qdoc3/test/linguist.qdocconf
index 7420b4f..dba4fb5 100644
--- a/tools/qdoc3/test/linguist.qdocconf
+++ b/tools/qdoc3/test/linguist.qdocconf
@@ -36,6 +36,9 @@ qhp.Linguist.extraFiles          = images/bg_l.png \
                              	   images/dynamiclayouts-example.png \
 									scripts/functions.js \
 									scripts/jquery.js \
+									style/style_ie6.css \
+									style/style_ie7.css \
+									style/style_ie8.css \
                              	    style/style.css
 
 qhp.Linguist.filterAttributes    = qt 4.7.0 tools linguist
diff --git a/tools/qdoc3/test/qdeclarative.qdocconf b/tools/qdoc3/test/qdeclarative.qdocconf
index 8015f57..f744879 100644
--- a/tools/qdoc3/test/qdeclarative.qdocconf
+++ b/tools/qdoc3/test/qdeclarative.qdocconf
@@ -47,6 +47,9 @@ qhp.Qml.extraFiles            = images/bg_l.png \
                              	   images/dynamiclayouts-example.png \
 									scripts/functions.js \
 									scripts/jquery.js \
+									style/style_ie6.css \
+									style/style_ie7.css \
+									style/style_ie8.css \
                              	    style/style.css
 
 qhp.Qml.filterAttributes    = qt 4.6.0 qtrefdoc
diff --git a/tools/qdoc3/test/qmake.qdocconf b/tools/qdoc3/test/qmake.qdocconf
index 49d088e..b7f4115 100644
--- a/tools/qdoc3/test/qmake.qdocconf
+++ b/tools/qdoc3/test/qmake.qdocconf
@@ -36,6 +36,9 @@ qhp.qmake.extraFiles          = images/bg_l.png \
                              	   images/dynamiclayouts-example.png \
 									scripts/functions.js \
 									scripts/jquery.js \
+									style/style_ie6.css \
+									style/style_ie7.css \
+									style/style_ie8.css \
                              	    style/style.css
 
 qhp.qmake.filterAttributes    = qt 4.7.0 tools qmake
diff --git a/tools/qdoc3/test/qt-build-docs.qdocconf b/tools/qdoc3/test/qt-build-docs.qdocconf
index f0c2535..d3c855f 100644
--- a/tools/qdoc3/test/qt-build-docs.qdocconf
+++ b/tools/qdoc3/test/qt-build-docs.qdocconf
@@ -42,6 +42,9 @@ qhp.Qt.extraFiles          = index.html \
                              	   images/dynamiclayouts-example.png \
 									scripts/functions.js \
 									scripts/jquery.js \
+								    style/style_ie6.css \
+									style/style_ie7.css \
+									style/style_ie8.css \
                              	    style/style.css
 
 
diff --git a/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf b/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf
index a00d5a1..e9bc00c 100644
--- a/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf
+++ b/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf
@@ -50,7 +50,10 @@ qhp.Qt.extraFiles          = index.html \
                              	   images/dynamiclayouts-example.png \
 									scripts/functions.js \
 									scripts/jquery.js \
-                             	    style/style.css
+                             	    style/style_ie6.css \
+									style/style_ie7.css \
+									style/style_ie8.css \
+									style/style.css
 
 language                = Cpp
 
diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf
index 9af2f92..e83e666 100644
--- a/tools/qdoc3/test/qt-html-templates.qdocconf
+++ b/tools/qdoc3/test/qt-html-templates.qdocconf
@@ -1,4 +1,8 @@
-HTML.stylesheets        = style/style.css
+HTML.stylesheets        =  style/style_ie6.css \
+									style/style_ie7.css \
+									style/style_ie8.css \
+									style/style.css
+									
 HTML.postheader         = " <div class=\"header\" id=\"qtdocheader\">\n" \
 			  "    <div id=\"nav-logo\">\n" \
 			  "      <a href=\"index.html\">Home</a></div>\n" \
diff --git a/tools/qdoc3/test/qt.qdocconf b/tools/qdoc3/test/qt.qdocconf
index 2f6983a..83a35a9 100644
--- a/tools/qdoc3/test/qt.qdocconf
+++ b/tools/qdoc3/test/qt.qdocconf
@@ -46,6 +46,9 @@ qhp.Qt.extraFiles          = index.html \
 			     images/dynamiclayouts-example.png \
 			     scripts/functions.js \
 			     scripts/jquery.js \
+			     style/style_ie6.css \
+			     style/style_ie7.css \
+			     style/style_ie8.css \
 			     style/style.css
 
 qhp.Qt.filterAttributes    = qt 4.7.0 qtrefdoc