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:
  Partially revert "Sunstudio12.1(5.10): Fix compile errors GTK style and other minor compile errors"
  Fix margins for placeholdertext in QLineEdit
  qdoc: Added TOC to module pages.
  Doc: Updating design files.
  Doc: Fixing design bugs. Updating the index page and script/style files. Adding some image files.
  qdoc: Changed <ul> elements in TOC.
  Fix QTextDocument::undo() cursor positioning

1 files changed, 54 insertions, 0 deletions

diff --git a/tools/qdoc3/test/style/style_ie6.css b/tools/qdoc3/test/style/style_ie6.css
new file mode 100644
index 0000000..16fb850
--- /dev/null
+++ b/tools/qdoc3/test/style/style_ie6.css
@@ -0,0 +1,54 @@
+.indexbox, .indexboxcont, .group {
+  zoom: 1;
+  height: 1%;
+}
+
+.sidebar {
+  margin-left: 3px;
+  width: 199px;
+  overflow: hidden;
+}
+
+.sidebar .search form {
+  position: relative;
+}
+
+.sidebar .search form fieldset {
+  position: absolute;
+  margin-top: -1px;
+}
+
+.sidebar .search form input#searchstring  {
+  border: 1px solid #fff;
+  height: 18px;
+}
+
+.wrap {
+  zoom: 1;
+}
+
+.content,
+.toolbar {
+  zoom: 1;
+  margin-left: -3px;
+  position: relative;
+}
+
+.indexbox {
+  clear: both;
+}
+
+.indexboxcont .section {
+  zoom: 1;
+  float: left;
+}
+
+.indexboxcont .sectionlist {
+  zoom: 1;
+  float: left;
+}
+
+.wrap .toolbar .toolbuttons li {
+  text-indent: 0;
+  margin-right: 8px;
+}
\ No newline at end of file