Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7

5 files changed, 90 insertions, 15 deletions

diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc
index e42dfca..57fc18a 100644
--- a/doc/src/index.qdoc
+++ b/doc/src/index.qdoc
@@ -45,7 +45,7 @@
                   <li><a href="how-to-learn-qt.html">How to learn Qt</a></li>
                   <li><a href="tutorials.html">Tutorials</a></li>
                   <li><a href="all-examples.html">Examples</a></li>
-                  <li><a href="qt4-7-intro.html">Whats new in Qt 4.7</a></li>
+                  <li><a href="qt4-7-intro.html">What's new in Qt 4.7</a></li>
                 </ul>
               </div>
             </div>
diff --git a/doc/src/legal/trademarks.qdoc b/doc/src/legal/trademarks.qdoc
index 42cb7a9..3bf783f 100644
--- a/doc/src/legal/trademarks.qdoc
+++ b/doc/src/legal/trademarks.qdoc
@@ -33,20 +33,20 @@
     \brief Information about trademarks owned by Nokia and other organisations.
 
     Nokia, the Nokia logo, Qt, and the Qt logo are trademarks of Nokia
-    Corporation and/or its subsidiaries in Finland and other countries.
+    Corporation and/or its subsidiaries in Finland and other countries.
 
     \list
     \o Intel, Intel Inside (logos), MMX and Pentium are \reg trademarks of
        Intel Corporation in the United States, other countries, or both.
-    \o Java and all Java-based trademarks are trademarks of Sun Microsystems,
-       Inc. in the United States, other countries, or both.
+    \o Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+       Other names may be trademarks of their respective owners.
     \o Linux is a \reg trademark of Linus Torvalds in the United States, other
        countries or both. 
     \o Mac, Mac OS and Macintosh are \reg trademarks of Apple Computer, Inc.,
        registered in the U.S. and other countries. 
-    \o Microsoft, Windows, Windows NT, XP, Visual Studio and the Windows logo
-       are \reg trademarks of Microsoft Corporation in the United States, other
-       countries, or both. 
+    \o Microsoft, Windows, Windows NT, XP, Windows Vista, Visual Studio and the
+       Windows logo are \reg trademarks of Microsoft Corporation in the United
+       States, other countries, or both.
     \o Motif is a registered trademark of The Open Group in the United States,
        other countries, or both. 
     \o OpenGL is a \reg trademark of Silicon Graphics, Inc. in the United States
diff --git a/doc/src/template/scripts/functions.js b/doc/src/template/scripts/functions.js
index 47539d2..62bc535 100755
--- a/doc/src/template/scripts/functions.js
+++ b/doc/src/template/scripts/functions.js
@@ -105,17 +105,17 @@ function processNokiaData(response){
 			/* start a new list element */
 			full_li_element = '<li';
 					/* if the pageType element reads APIPage, add class name api */
-      if (propertyTags[j].getElementsByTagName('pageType')[0].firstChild.nodeValue == 'APIPage') {
+      if (propertyTags[i].getElementsByTagName('pageType')[0].firstChild.nodeValue == 'APIPage') {
       	full_li_element += ' class="api"';
       	apiCount++;
       }
 					/* if the pageType element reads Article, add class name article */
-      else if (propertyTags[j].getElementsByTagName('pageType')[0].firstChild.nodeValue == 'Article') {
+      else if (propertyTags[i].getElementsByTagName('pageType')[0].firstChild.nodeValue == 'Article') {
       	full_li_element += ' class="article"';
       	articleCount++;
       }
 					/* if the pageType element reads Example, add class name example */
-      else if (propertyTags[j].getElementsByTagName('pageType')[0].firstChild.nodeValue == 'Example') {
+      else if (propertyTags[i].getElementsByTagName('pageType')[0].firstChild.nodeValue == 'Example') {
       	full_li_element += ' class="example"';
       	exampleCount++;
       }
diff --git a/doc/src/template/style/narrow.css b/doc/src/template/style/narrow.css
index c1e3f61..fbb0752 100644
--- a/doc/src/template/style/narrow.css
+++ b/doc/src/template/style/narrow.css
@@ -223,6 +223,7 @@
       float: right;
       margin: 15px 40px 0 0;
       font-size: 11px;
+      position: relative;
     }
 
     .narrow #narrowmenu {
diff --git a/doc/src/template/style/style.css b/doc/src/template/style/style.css
index 536b3c8..16bc9ed 100755
--- a/doc/src/template/style/style.css
+++ b/doc/src/template/style/style.css
@@ -101,7 +101,7 @@
     }
     a
     {
-        color: #00732f;
+        color: #00732F;
         text-decoration: none;
     }
     hr
@@ -660,13 +660,31 @@
 		-webkit-box-shadow: 0 4px 6px 0 rgba(0,0,0,.2);
 		-moz-box-shadow: 0 4px 6px 0 rgba(0,0,0,.2);
 		box-shadow: 0 4px 6px 0 rgba(0,0,0,.2);
+		font-size: 11px;
+	}
+
+	#resultdialog a
+  {
+      color: #00732f;
 	}
 
 	#resultdialog.active {
 	  display: block;
-	  width:30%;
 	}
 
+	.narrow #resultdialog {
+	  width: 60%;
+	  _width: 360px;
+	}
+
+	.narrow #resultdialog.active {
+    right: 10px;
+	  *left: auto;
+	  _left: auto;
+    _right: -20px;
+	}
+
+
 	#resultdialog #resultclose {
 	  float: right;
 	}
@@ -779,6 +797,7 @@
         margin-right: 15px;
         font-weight: bold;
         color: #B0ADAB;
+        font: bold 10px/1.2 Verdana;
     }
 
     .toolbuttons #print
@@ -892,7 +911,6 @@
     }
     .wrap .content h2
     {
-	border-bottom:1px solid #DDDDDD;
 	font:600 16px/1.2 Arial;
 	margin-top:15px;
 	width:100%;	
@@ -990,7 +1008,7 @@
 	/*display:inline-block;*/
 	margin-left:10px;
 	min-width:250px;
-	line-height: 1.2;
+	line-height: 1.5;
 	min-width:100%;
 	min-height:15px;
 	}
@@ -1279,6 +1297,10 @@
         background-color: #E6E7E8;
         margin: 0;
     }
+   .small
+    {
+        font: normal 9px/1 Verdana;
+    }	
 /* end footer elements */
 
 
@@ -1453,7 +1475,7 @@
 	}
 
 
-    .creator .header, .footer, .wrapper
+    .creator .header, .creator .footer, .creator .wrapper
     {
         max-width: 1500px;
         margin: 0px;
@@ -1658,6 +1680,58 @@
 	}
 /* end of creator spec*/
 	
+	.item {
+	  float: left;
+	  position: relative;
+	  width: 100%;
+	  overflow: hidden;
+	}
+
+
+	.item .primary {
+	  margin-right: 220px;
+	  position: relative;
+	}
+
+	.item hr {
+	  margin-left: -220px;
+	}
+
+	.item .secondary {
+	  float: right;
+	  width: 200px;
+	  position: relative;
+	}
+
+	.item .cols {
+	  clear: both;
+	  display: block;
+	}
+
+	.item .cols .col {
+	  float: left;
+	  margin-left: 1.5%;
+	}
+
+	.item .cols .col.first {
+	  margin-left: 0;
+	}
+
+	.item .cols.two .col {
+	  width: 45%;
+	}
+
+	.item .box {
+	  margin: 0 0 10px 0;
+	}
+
+	.item .box h3 {
+	  margin: 0 0 10px 0;
+	}
+
+	.cols.unclear {
+		clear:none;
+	}
 }
 
 /* end of screen media */