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

6 files changed, 105 insertions, 616 deletions

diff --git a/doc/src/declarative/qdeclarativeintro.qdoc b/doc/src/declarative/qdeclarativeintro.qdoc
index 9126a79..3f1b184 100644
--- a/doc/src/declarative/qdeclarativeintro.qdoc
+++ b/doc/src/declarative/qdeclarativeintro.qdoc
@@ -314,7 +314,7 @@ Item {
 
 \section2 Signal Handlers
 
-Signal handlers allow actions to be taken in reponse to an event.  For instance,
+Signal handlers allow actions to be taken in response to an event.  For instance,
 the \l MouseArea element has signal handlers to handle mouse press, release
 and click:
 
diff --git a/doc/src/declarative/qdeclarativemodels.qdoc b/doc/src/declarative/qdeclarativemodels.qdoc
index b44e6f2..a2f4d3a 100644
--- a/doc/src/declarative/qdeclarativemodels.qdoc
+++ b/doc/src/declarative/qdeclarativemodels.qdoc
@@ -429,4 +429,77 @@ Rectangle {
 }
 \endcode
 
+\section1 Accessing Views and Models from Delegates
+
+You can access the view for which a delegate is used, and its
+properties, by using ListView.view in a delegate on a ListView, or
+GridView.view in a delegate on a GridView, etc. In particular, you can
+access the model and its properties by using ListView.view.model.
+
+This is useful when you want to use the same delegate for a number of
+views, for example, but you want decorations or other features to be
+different for each view, and you would like these different settings to
+be properties of each of the views. Similarly, it might be of interest
+to access or show some properties of the model.
+
+In the following example, the delegate shows the property \e{language}
+of the model, and the color of one of the fields depends on the
+property \e{fruit_color} of the view.
+
+\code
+Rectangle {
+     width: 200; height: 200
+
+    ListModel {
+        id: fruitModel
+        property string language: "en"
+        ListElement {
+            name: "Apple"
+            cost: 2.45
+        }
+        ListElement {
+            name: "Orange"
+            cost: 3.25
+        }
+        ListElement {
+            name: "Banana"
+            cost: 1.95
+        }
+    }
+
+    Component {
+        id: fruitDelegate
+        Row {
+                Text { text: " Fruit: " + name; color: ListView.view.fruit_color }
+                Text { text: " Cost: $" + cost }
+                Text { text: " Language: " + ListView.view.model.language }
+        }
+    }
+
+    ListView {
+        property color fruit_color: "green"
+        model: fruitModel
+        delegate: fruitDelegate
+        anchors.fill: parent
+    }
+}
+\endcode
+
+Another important case is when some action (e.g. mouse click) in the
+delegate should update data in the model. In this case you can define
+a function in the model, e.g.:
+
+\code
+        setData(int row, const QString & field_name, QVariant new_value),
+\endcode
+
+...and call it from the delegate using:
+
+\code
+        ListView.view.model.setData(index, field, value)
+\endcode
+
+...assuming that \e{field} holds the name of the field which should be
+updated, and that \e{value} holds the new value.
+
 */
diff --git a/doc/src/getting-started/examples.qdoc b/doc/src/getting-started/examples.qdoc
index b6766d5..a32d120 100644
--- a/doc/src/getting-started/examples.qdoc
+++ b/doc/src/getting-started/examples.qdoc
@@ -343,8 +343,8 @@
 /*!
     \page examples-draganddrop.html
     \ingroup all-examples
-    \title Drag &amp Drop Examples
-    \brief How to access your platform's native darg &amp drop functionality
+    \title Drag & Drop Examples
+    \brief How to access your platform's native darg & drop functionality
 
     \image draganddrop-examples.png
 
diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc
index 18a1746..42fd4fc 100644
--- a/doc/src/index.qdoc
+++ b/doc/src/index.qdoc
@@ -56,30 +56,29 @@
             <div class="indexboxcont indexboxbar ">
               <div class="sectionlist tricol">
                 <ul>
-                  <li><a href="classes.html">Class index</a></li>
-                  <li><a href="functions.html">Function index</a></li>
-                  <li><a href="modules.html">Modules</a></li>
-                  <li><a href="namespaces.html">Namespaces</a></li>
-		  <li><a href="qtglobal.html">Global stuff</a></li>
-		  <li><a href="qdeclarativeelements.html">QML elements</a></li>
+					<li><a href="classes.html">Class index</a></li>
+					<li><a href="functions.html">Function index</a></li>
+					<li><a href="modules.html">Modules</a></li>
+					<li><a href="namespaces.html">Namespaces</a></li>
+					<li><a href="qtglobal.html">Global Declarations</a></li>
                 </ul>
               </div>
               <div class="sectionlist  tricol">
                 <ul>
-		  <li><a href="qt-basic-concepts.html">Basic Qt Architecture</a></li>
-		  <li><a href="declarativeui.html">Device UI's &amp; Qt Quick</a></li>
-		  <li><a href="qt-gui-concepts.html">Desktop UI components</a></li>
-		  <li><a href="platform-specific.html">Platform-specific info</a></li>
-		  <li><a href="qt-graphics.html">Graphics, Painting &amp; Printing</a></li>
-                  <li><a href="qt-network.html">Input/Output &amp; networking</a></li>
+					<li><a href="qt-basic-concepts.html">Programming with Qt</a></li>
+					<li><a href="qt-basic-concepts.html">Qt Architecture</a></li>
+					<li><a href="developing-with-qt.html">Cross-platform &amp; Platform-specific Development</a></li>
+					<li><a href="technology-apis.html">Qt &amp; standard technologies </a></li>
+					<li><a href="best-practices.html">Qt How-to's &amp; best practices</a></li>
                 </ul>
               </div>
               <div class="sectionlist">
                 <ul>
-                  <li><a href="model-view-programming.html">Model/View programming</a></li>
-                  <li><a href="technology-apis.html">Qt API's for other technologies</a></li>
-                  <li><a href="best-practices.html">Qt How-to's &amp; best practices</a></li>
-                  <li><a href="developing-with-qt.html">Cross-platform development</a></li>
+					<li><a href="declarativeui.html">Qt Quick</a></li>
+					<li><a href="qdeclarativeintroduction.html">Introduction to QML</a></li>
+					<li><a href="qdeclarativeelements.html">QML Elements</a></li>
+					<li><a href="qt-gui-concepts.html">UI components</a></li>
+					<li><a href="declarativeui.html">Qt & GUI design</a></li>
                 </ul>
               </div>
             </div>
diff --git a/doc/src/template/style/OfflineStyle.css b/doc/src/template/style/OfflineStyle.css
index afa7de0..9f5d28b 100644
--- a/doc/src/template/style/OfflineStyle.css
+++ b/doc/src/template/style/OfflineStyle.css
@@ -1,588 +1,26 @@
 @media screen
 {
-    html
-    {
-        color: #000000;
-        background: #FFFFFF;
-    }
-    body, div, dl, dt, dd, ul, ol, li, h1, h2, h3, h4, h5, h6, pre, code, form, fieldset, legend, input, button, textarea, p, blockquote, th, td
-    {
-        margin: 0;
-        padding: 0;
-    }
-    table
-    {
-        border-collapse: collapse;
-        border-spacing: 0;
-    }
-    fieldset, img
-    {
-        border: 0;
-    }
-    address, caption, cite, code, dfn, em, strong, th, var, optgroup
-    {
-        font-style: inherit;
-        font-weight: inherit;
-    }
-    del, ins
-    {
-        text-decoration: none;
-    }
-    li
-    {
-        list-style: none;
-    }
-    caption, th
-    {
-        text-align: left;
-    }
-    h1, h2, h3, h4, h5, h6
-    {
-        font-size: 100%;
-    }
-    q:before, q:after
-    {
-        content: '';
-    }
-    abbr, acronym
-    {
-        border: 0;
-        font-variant: normal;
-    }
-    sup
-    {
-        vertical-align: baseline;
-    }
-    sub
-    {
-        vertical-align: baseline;
-    }
-	tt, .qmlreadonly span, .qmldefault span
-	{
-		word-spacing:5px;
-	}
-    .heading
-    {
-        font: normal 600 16px/1.0 Arial;
-    }
-    .subtitle
-    {
-        font-size: 13px;
-    }
-    .small-subtitle
-    {
-        font-size: 13px;
-    }
-    legend
-    {
-        color: #000000;
-    }
-    input, button, textarea, select, optgroup, option
-    {
-        font-family: inherit;
-        font-size: inherit;
-        font-style: inherit;
-        font-weight: inherit;
-    }
-    input, button, textarea, select
-    {
-        font-size: 100%;
-    }
-    body
-    {
-        font: normal 13px/1.2 Verdana;
-        color: #363534;
-    }
-    strong
-    {
-        font-weight: bold;
-    }
-    em
-    {
-        font-style: italic;
-    }
-    a
-    {
-        color: #00732f;
-        text-decoration: none;
-    }
-    .header, .footer, .wrapper
-    {
-        /*min-width: 600px;*/
-        max-width: 1500px;
-        margin: 0 5px;
-    }
+
     .wrapper
     {
-	position:relative;
 	top:50px;
+    background: none;
+
     }
     .wrapper .bd
     {
+        background: none;
         position: relative;
     }
 
-    .header, .footer
-    {
-        display: block;
-        clear: both;
-        overflow: hidden;
-    }
-    .header
-    {
-        height: 115px;
-        position: relative;
-    }
-    
-    
-    .header .qtref
-    {
-        position: absolute;
-        top: 28px;
-        left: 88px;
-        width: 302px;
-        height: 22px;
-    }
-    .header .qtref span
-    {
-        display: block;
-        height: 22px;
-    }
-    .wrap .content h1
-    {
-        font: 600 18px/1.2 Arial;
-    }
-    .wrap .content h2
-    {
-        font: 600 16px/1.2 Arial;
-    }
-    .wrap .content h3
-    {
-        font: 600 14px/1.2 Arial;
-    }
-    .wrap .content h4
-    {
-        font: 600 12px/1.2 Arial;
-    }
-	
-    .wrap .content p
-    {
-        line-height: 20px;
-        padding: 5px;
-    }
-    .wrap .content table p
-    {
-        line-height: 20px;
-        padding: 0px;
-    }	
-    .wrap .content ul
-    {
-        padding-left: 25px;
-        padding-top: 10px;
-    }
-    a:hover
-    {
-        color: #4c0033;
-        text-decoration: underline;
-    }
-    .content a:visited
-    {
-        color: #4c0033;
-        text-decoration: none;
-    }
-     .content a:visited:hover
-    {
-        color: #4c0033;
-        text-decoration: underline;
-    }   
-
-    pre
-    {
-        border: 1px solid #DDDDDD;
-        margin: 0 20px 10px 10px;
-        padding: 20px 15px 20px 20px;
-        overflow-x: auto;
-    }
-    table, pre
-    {
-        -moz-border-radius: 7px 7px 7px 7px;
-        background-color: #F6F6F6;
-        border: 1px solid #E6E6E6;
-        border-collapse: separate;
-        font-size: 11px;
-        /*min-width: 395px;*/
-        margin-bottom: 25px;
-        display: inline-block;
-    }
-    thead
-    {
-        margin-top: 5px;
-		font:600 12px/1.2 Arial;
-    }
-    th
-    {
-        padding: 5px 15px 5px 15px;
-        background-color: #E1E1E1;
-      /*  border-bottom: 1px solid #E6E6E6;*/
-        border-left: 1px solid #E6E6E6;
-      /*  border-right: 1px solid #E6E6E6;*/
-    }
-    td
-    {
-        padding: 3px 15px 3px 20px;
-  /*      border-left: 1px solid #E6E6E6;
-        border-right: 1px solid #E6E6E6;*/
-    }
-    tr.odd td:hover,  tr.even td:hover
-    {
-    /*    border-right: 1px solid #C3C3C3;
-        border-left: 1px solid #C3C3C3;*/
-    }
-		
-	td.rightAlign
-	{
-        padding: 3px 15px 3px 10px;
-	}
-    table tr.odd
-    {
-        border-left: 1px solid #E6E6E6;
-        background-color: #F6F6F6;
-        color: #66666E;
-    }
-    table tr.even
-    {
-        border-left: 1px solid #E6E6E6;
-        background-color: #ffffff;
-        color: #66666E;
-    }
-    table tr.odd td:hover, table tr.even td:hover
-    {
-        background-color: #E6E6E6;
-    }
-    		
-    span.comment
-    {
-        color: #8B0000;
-        font-style: italic;
-    }
-    span.string, span.char
-    {
-        color: #254117;
-    }
-
-    .qmltype
-    {
-        text-align: center;
-        font-size: 160%;
-    }
-    .qmlreadonly
-    {
-        float: right;
-        color: #254117;
-    }
-
-    .qmldefault
-    {
-        float: right;
-        color: red;
-    }
-
-	.footer
-    {
-		border-top:1px solid #E5E5E5;
-        min-height: 100px;
-        color: #797775;
-        font: normal 9px/1 Verdana;
-        text-align: center;
-        padding-top: 40px;
-        margin: 0;
-    }
 
     
-     .wrap
-    {
-        margin: 0 5px 0 5px;
-    }
-    .wrap .toolbar
-    {
-     display:block;
-    }
-
-    .wrap .breadcrumb ul li
-    {
-        float: left;
-        background: url(../images/breadcrumb.png) no-repeat 0 5px;
-        padding-left: 15px;
-        margin-left: 15px;
-        font-weight: bold;
-    }
-    .wrap .breadcrumb ul li.last
-    {
-        font-weight: normal;
-    }
-    .wrap .breadcrumb ul li a
-    {
-      /*  color: #363534;*/
-        color: #00732F;
-    }
-    .wrap .breadcrumb ul li.first
-    {
-        background-image: none;
-        padding-left: 0;
-        margin-left: 0;
-    }
-    .wrap .content
-    {
-		word-wrap:break-word;
-    }
-    .wrap .content li
-    {
-        /*padding-left: 12px;*/
-        background: url(../images/bullet_sq.png) no-repeat 0 5px;
-        font: normal 400 10pt/1 Verdana;
-       /* color: #44a51c;*/
-        margin-bottom: 10px; 
-    }
-
-    .offline .wrap .content
-    {
-        padding-top: 15px;
-    }
-
-    .header:after, .footer:after, .breadcrumb:after, .wrap .content:after, .group:after
-    {
-        content: ".";
-        display: block;
-        height: 0;
-        clear: both;
-        visibility: hidden;
-    }
-    
-    hr
-    {
-        background-color: #E6E6E6;
-        border: 1px solid #E6E6E6;
-        height: 1px;
-        width: 100%;
-        text-align: left;
-        margin: 5px 0px 5px 0px;
-    }
-
-    .content .alignedsummary
-    {
-        margin: 5px;
-		width:100%;
-    }
-
-     
-    .toc
-    {
-        float: right;
-        -moz-border-radius: 7px 7px 7px 7px;
-        background-color: #F6F6F6;
-        border: 1px solid #DDDDDD;
-        margin: 0 20px 10px 10px;
-        padding: 20px 15px 20px 20px;
-        height: auto;
-        width: 200px;
-    }
-
-    .toc h3, .generic a
-    {
-        font: 600 12px/1.2 Arial;
-    }
-
-    .wrap .content .toc ul
-    {
-        padding-left: 0px;
-    }
-
-
-    .wrap .content .toc .level2
-    {
-        margin-left: 15px;
-    }
-
-    .wrap .content .toc .level3
-    {
-        margin-left: 30px;
-    }
-
-    .content .toc li
-    {
-        font: normal 10px/1.2 Verdana;
-        background: url(../images/bullet_dn.png) no-repeat 0 5px;
-    }
-	
-	
-	.generic{
-		max-width:75%;
-	}
-	.generic td{
-		padding:0;
-	}
-	
-	.generic .odd .alphaChar{
-        background-color: #F6F6F6;
-	}
-	
-	.generic .even .alphaChar{
-        background-color: #FFFFFF;
-	}
-
-	.highlightedCode
-	{
-	margin:10px;
-	}
-
-	.flowList{
-	vertical-align:top;
-	}	
-	.alphaChar{
-	width:100%;
-	background-color:#F6F6F6;
-	border:1px solid #E6E6E6;
-	font-size:12pt;
-	padding-left:10px;
-	margin-top:10px;
-	margin-bottom:10px;
-	}
-
-	.flowList dl{
-	}
-	.flowList dd{
-	display:inline-block;
-	margin-left:10px;
-	width:250px;
-	}
-	.wrap .content .flowList p{
-	padding:0px;
-	}
-	
-    .relpage
-    {
-        -moz-border-radius: 7px 7px 7px 7px;
-        border: 1px solid #DDDDDD;
-        padding: 25px 25px;
-        clear: both;
-    }
-    .relpage ul
-    {
-        float: none;
-        padding: 15px;
-    }
-    .content .relpage li
-    {
-        font: normal 11px/1.2 Verdana;
-    }
-    h3.fn, span.fn
-    {
-        background-color: #F6F6F6;
-        border-width: 1px;
-        border-style: solid;
-        border-color: #E6E6E6;
-        font-weight: bold;
-		word-spacing:3px;
-    }
-
-	.functionIndex {
-	font-size:12pt;
-	word-spacing:10px;
-	margin-bottom:10px;
-    background-color: #F6F6F6;
-    border-width: 1px;
-    border-style: solid;
-    border-color: #E6E6E6;
-	width:100%;
-	}
-	
-	.centerAlign {	text-align:center;}
-	.rightAlign {text-align:right;}
-	.leftAlign {text-align:left;}
-	.topAlign{vertical-align:top	}
-	.functionIndex a{display:inline-block;}
-
-    /* start index box */
-    .indexbox
-    {
-        width: 100%;
-		display:inline-block;
-    }
-
-    .indexboxcont { display: block; }
-
-    .indexboxbar
-    {
-		border-bottom:1px solid #E5E5E5;
-        margin-bottom: 25px;
-    }
-
-    .indexboxcont .section
-    {
-        display: inline-block;
-        padding:0 2% 0 1%;
-        vertical-align:top;
-	}
-
-	.indexboxcont .section {
-	  float: left;
-	}
-
-    .indexboxcont .section p
-    {
-        padding-top: 20px;
-        padding-bottom: 20px;
-    }
-    .indexboxcont .sectionlist
-    {
-        display: inline-block;
-		vertical-align:top;
-        padding: 0;
-    }
-    .indexboxcont .sectionlist ul
-    {
-        margin-bottom: 20px;
-    }
-
-    .indexboxcont .sectionlist ul li
-    {
-        line-height: 12px;
-    }
-
-    .content .indexboxcont li
-    {
-        font: normal 600 13px/1 Verdana;
-    }
-
-    .indexbox a:hover, .indexbox a:visited:hover
-    {
-        color: #4c0033;
-        text-decoration: underline;
-    }
-
-    .indexbox a:visited
-    {
-        color: #00732f;
-        text-decoration: none;
-    }
-	
-	.indexbox .indexIcon {
-	width: 11%;
-	}
-	
-   
-    .indexboxcont:after
-    {
-        content: ".";
-        display: block;
-        height: 0;
-        clear: both;
-        visibility: hidden;
-    }
-	
+ 
     body.offline
     {
       background-image: none;
+      background-color: #FFFFFF;
+	  
     }
 
     .offline .footer {
@@ -811,22 +249,3 @@ ul.sf-menu li li li.sfHover ul {
 }
 /* end of screen media */
 
-/* start of print media */
-
-@media print
-{
-     input, textarea, .header, .footer, .toolbar, .feedback, .wrapper .hd, .wrapper .bd .sidebar, .wrapper .ft
-    {
-        display: none;
-        background: none;
-    }
-    .content
-    {
-        position: absolute;
-        top: 0px;
-        left: 0px;
-        background: none;
-        display: block;
-    }
-}
-/* end of print media */
diff --git a/doc/src/template/style/style.css b/doc/src/template/style/style.css
index 184a832..5144020 100755
--- a/doc/src/template/style/style.css
+++ b/doc/src/template/style/style.css
@@ -18,8 +18,6 @@
     fieldset, img
     {
         border: 0;
-		height:100%;
-		width:100%
     }
     address, caption, cite, code, dfn, em, strong, th, var, optgroup
     {
@@ -66,7 +64,7 @@
 	}
     .heading
     {
-        font: normal 600 16px/1.0 Arial;
+        font: normal bold 16px/1.0 Arial;
         padding-bottom: 15px;
     }
     .subtitle
@@ -212,7 +210,7 @@
         font-size: 11px;
     }
 
-    .offline .sidebar, .offline .feedback, .offline .t_button
+    .offline .sidebar, .offline .feedback, .offline .t_button, .offline #narrowsearch, .offline #narrowmenu
     {
         display: none;
     }
@@ -258,7 +256,7 @@
 
     .sidebar .box h2
     {
-        font: 600 16px/1.2 Arial;
+        font: bold 16px/1.2 Arial;
         padding: 0;
 /*        min-height: 32px;*/
     }
@@ -493,7 +491,7 @@
 
     .wrap .content h1
     {
-        font: 600 18px/1.2 Arial;
+        font: bold 18px/1.2 Arial;
     }
     .wrap .content h2
     {
@@ -506,7 +504,7 @@
     }
     .wrap .content h3
     {
-        font: 600 14px/1.2 Arial;
+        font: bold 14px/1.2 Arial;
 		/*border-bottom:1px solid #DDDDDD;*/
 		font:600 16px/1.2 Arial;
 		margin-top:15px;
@@ -934,7 +932,7 @@
 
     .toc h3, .generic a
     {
-        font: 600 12px/1.2 Arial;
+        font: bold 12px/1.2 Arial;
     }
 
 	.generic{
@@ -1141,7 +1139,7 @@
 
     .content .indexboxcont li
     {
-        font: normal 600 13px/1 Verdana;
+        font: normal bold 13px/1 Verdana;
     }
 
     .indexbox a:hover, .indexbox a:visited:hover