"
+	out() << "
"
               << trimmedTrailing(highlightedCode(indent(codeIndent,atom->string()),
                                                  marker,relative))
               << "
\n";
 	break;
 #ifdef QDOC_QML
     case Atom::Qml:
-	out() << "
"
+	out() << "
"
               << trimmedTrailing(highlightedCode(indent(codeIndent,atom->string()),
                                                  marker,relative))
               << "
\n";
@@ -529,7 +529,7 @@ int HtmlGenerator::generateAtom(const Atom *atom,
 #endif
     case Atom::CodeNew:
         out() << "
you can rewrite it as
\n"
-              << "
"
+              << "
"
               << trimmedTrailing(highlightedCode(indent(codeIndent,atom->string()),
                                                  marker,relative))
               << "
\n";
@@ -538,9 +538,9 @@ int HtmlGenerator::generateAtom(const Atom *atom,
         out() << "
For example, if you have code like
\n";
         // fallthrough
     case Atom::CodeBad:
-        out() << "
"
+        out() << "
"
               << trimmedTrailing(protectEnc(plainCode(indent(codeIndent,atom->string()))))
-              << "
\n";
+              << "
\n";
 	break;
     case Atom::FootnoteLeft:
         // ### For now
@@ -849,7 +849,7 @@ int HtmlGenerator::generateAtom(const Atom *atom,
             if (atom->next() != 0)
                 text = atom->next()->string();
             if (atom->type() == Atom::Image)
-                out() << "
";
+                out() << "
";
             if (fileName.isEmpty()) {
                 out() << "[Missing image "
                       << protectEnc(atom->string()) << "]";
@@ -868,7 +868,7 @@ int HtmlGenerator::generateAtom(const Atom *atom,
     case Atom::ImageText:
         break;
     case Atom::LegaleseLeft:
-        out() << "
";
+        out() << "
";
         break;
     case Atom::LegaleseRight:
         out() << "
";
@@ -910,13 +910,13 @@ int HtmlGenerator::generateAtom(const Atom *atom,
         else if (atom->string() == ATOM_LIST_VALUE) {
             threeColumnEnumValueTable = isThreeColumnEnumValueTable(atom);
             if (threeColumnEnumValueTable) {
-                out() << "
"
+                out() << ""
                       << ""
                       << ""
                       << "\n";
             }
             else {
-                out() << "
Constant
Value
Description
"
+                out() << ""
                       << "\n";
             }
         }
@@ -951,10 +951,10 @@ int HtmlGenerator::generateAtom(const Atom *atom,
         else { // (atom->string() == ATOM_LIST_VALUE)
             // ### Trenton
 
-            out() << "
Constant
Value
"
+            out() << "
"
                   << protectEnc(plainCode(marker->markedUpEnumValue(atom->next()->string(),
                                                                  relative)))
-                  << "
";
+                  << "
";
 
             QString itemValue;
             if (relative->type() == Node::Enum) {
@@ -980,7 +980,7 @@ int HtmlGenerator::generateAtom(const Atom *atom,
         }
         else if (atom->string() == ATOM_LIST_VALUE) {
             if (threeColumnEnumValueTable) {
-                out() << "
";
+                out() << "
";
                 if (matchAhead(atom, Atom::ListItemRight))
                     out() << " ";
             }
@@ -1010,7 +1010,7 @@ int HtmlGenerator::generateAtom(const Atom *atom,
             out() << "\n";
         }
         else if (atom->string() == ATOM_LIST_VALUE) {
-            out() << "
\n";
+            out() << "\n";
         }
         else {
             out() << "\n";
@@ -1091,29 +1091,28 @@ int HtmlGenerator::generateAtom(const Atom *atom,
         }
         if (!atom->string().isEmpty()) {
             if (atom->string().contains("%"))
-                out() << "
string() << "\" "
-                      << "align=\"center\">\n";
+                out() << "string() << "\">\n ";
             else {
-                out() << "
\n";
+                out() << "\n";
             }
         }
         else {
-            out() << "
\n";
+            out() << "\n";
         }
         numTableRows = 0;
         break;
     case Atom::TableRight:
-        out() << "
\n";
+        out() << "\n";
         break;
     case Atom::TableHeaderLeft:
-        out() << "";
+        out() << "";
         inTableHeader = true;
         break;
     case Atom::TableHeaderRight:
         out() << "";
         if (matchAhead(atom, Atom::TableHeaderLeft)) {
             skipAhead = 1;
-            out() << "\n";
+            out() << "\n";
         }
         else {
             out() << "\n";
@@ -1122,9 +1121,9 @@ int HtmlGenerator::generateAtom(const Atom *atom,
         break;
     case Atom::TableRowLeft:
         if (++numTableRows % 2 == 1)
-            out() << "";
+            out() << "";
         else
-            out() << "";
+            out() << "";
         break;
     case Atom::TableRowRight:
         out() << "\n";
@@ -1189,11 +1188,11 @@ int HtmlGenerator::generateAtom(const Atom *atom,
         out() << "string()) << "\">";
         break;
     case Atom::UnhandledFormat:
-        out() << "<Missing HTML>";
+        out() << "<Missing HTML>";
         break;
     case Atom::UnknownCommand:
-        out() << "\\" << protectEnc(atom->string())
-              << "";
+        out() << "\\" << protectEnc(atom->string())
+              << "";
         break;
 #ifdef QDOC_QML
     case Atom::QmlText:
@@ -1811,7 +1810,7 @@ void HtmlGenerator::generateBrief(const Node *node, CodeMarker *marker,
 void HtmlGenerator::generateIncludes(const InnerNode *inner, CodeMarker *marker)
 {
     if (!inner->includes().isEmpty()) {
-        out() << "
"
+        out() << "
"
               << trimmedTrailing(highlightedCode(indent(codeIndent,
                                                         marker->markedUpIncludes(inner->includes())),
                                                  marker,inner))
@@ -1845,8 +1844,8 @@ void HtmlGenerator::generateTableOfContents(const Node *node,
 
     QString tdTag;
     if (numColumns > 1) {
-        tdTag = "";
-        out() << "
\n"
+        tdTag = "
"; /* width=\"" + QString::number((100 + numColumns - 1) / numColumns) + "%\">";*/
+        out() << "\n"
               << tdTag << "\n";
     }
 
@@ -1898,7 +1897,7 @@ void HtmlGenerator::generateTableOfContents(const Node *node,
     }
 
     if (numColumns > 1)
-        out() << "
\n";
+        out() << "
\n";
 
     inContents = false;
     inLink = false;
@@ -2011,7 +2010,7 @@ void HtmlGenerator::generateNavigationBar(const NavigationBar& bar,
 {
     if (bar.prev.begin() != 0 || bar.current.begin() != 0 ||
          bar.next.begin() != 0) {
-        out() << "
";
+        out() << "
";
         if (bar.prev.begin() != 0) {
 #if 0
             out() << "[
\n";
+    out() << "\n";
 
     int row = 0;
     foreach (const QString &name, nodeMap.keys()) {
@@ -2197,9 +2196,9 @@ void HtmlGenerator::generateAnnotatedList(const Node *relative,
             continue;
 
         if (++row % 2 == 1)
-            out() << "";
+            out() << "";
         else
-            out() << "";
+            out() << "";
         out() << "";
@@ -2219,7 +2218,7 @@ void HtmlGenerator::generateAnnotatedList(const Node *relative,
         }
         out() << "\n";
     }
-    out() << "
";
         generateFullName(node, relative, marker);
         out() << "
\n";
+    out() << "\n";
 }
 
 /*!
@@ -2372,7 +2371,7 @@ void HtmlGenerator::generateCompactList(const Node *relative,
     }
     firstOffset[NumColumns] = classMap.count();
 
-    out() << "
\n";
+    out() << "\n";
     for (k = 0; k < numRows; k++) {
         out() << "\n";
         for (i = 0; i < NumColumns; i++) {
@@ -2393,7 +2392,7 @@ void HtmlGenerator::generateCompactList(const Node *relative,
                     currentParagraphNo[i] = NumParagraphs - 1;
                 }
 #endif
-                out() << "\n";
     }
-    out() << "
";
+                out() << "
";
                 if (currentOffsetInParagraph[i] == 0) {
                     // start a new paragraph
                     out() << ""
@@ -2436,18 +2435,18 @@ void HtmlGenerator::generateCompactList(const Node *relative,
         }
         out() << "
\n";
+    out() << "\n";
 }
 
 void HtmlGenerator::generateFunctionIndex(const Node *relative,
                                           CodeMarker *marker)
 {
-    out() << "
";
+    out() << "
";
     for (int i = 0; i < 26; i++) {
         QChar ch('a' + i);
         out() << QString("%2 ").arg(ch).arg(ch.toUpper());
     }
-    out() << "
\n";
+    out() << "
\n";
 
     char nextLetter = 'a';
     char currentLetter;
@@ -2715,8 +2714,8 @@ void HtmlGenerator::generateSection(const NodeList& nl,
         }
         else {
             if (twoColumn)
-                out() << "
\n"
-                      << "\n
";
+                out() << "\n"
+                      << "\n
";
             out() << "
\n";
         }
 
@@ -2729,12 +2728,11 @@ void HtmlGenerator::generateSection(const NodeList& nl,
             }
 
             if (name_alignment) {
-                out() << "
";
+                out() << "
 ";
             }
             else {
                 if (twoColumn && i == (int) (nl.count() + 1) / 2)
-                    out() << "
\n";
+                    out() << "
\n";
                 out() << "
";
             }
 
@@ -2751,7 +2749,7 @@ void HtmlGenerator::generateSection(const NodeList& nl,
         else {
             out() << "
\n";
             if (twoColumn)
-                out() << "
\n";
+                out() << "
\n";
         }
     }
 }
@@ -2777,8 +2775,8 @@ void HtmlGenerator::generateSectionList(const Section& section,
         }
         else {
             if (twoColumn)
-                out() << "
\n"
-                      << "\n
";
+                out() << "\n"
+                      << "\n
";
             out() << "
\n";
         }
 
@@ -2791,12 +2789,11 @@ void HtmlGenerator::generateSectionList(const Section& section,
             }
 
             if (name_alignment) {
-                out() << "
";
+                out() << "
 ";
             }
             else {
                 if (twoColumn && i == (int) (section.members.count() + 1) / 2)
-                    out() << "
\n";
+                    out() << "
\n";
                 out() << "
";
             }
 
@@ -2813,7 +2810,7 @@ void HtmlGenerator::generateSectionList(const Section& section,
         else {
             out() << "
\n";
             if (twoColumn)
-                out() << "
\n";
+                out() << "
\n";
         }
     }
 
@@ -2910,7 +2907,7 @@ QString HtmlGenerator::highlightedCode(const QString& markedCode,
     for (int i = 0, n = src.size(); i < n;) {
         if (src.at(i) == charLangle && src.at(i + 1).unicode() == '@') {
             if (nameAlignment && !done) {// && (i != 0)) Why was this here?
-                html += "";
+                html += "";
                 done = true;
             }
             i += 2;
@@ -3075,8 +3072,8 @@ void HtmlGenerator::generateSectionList(const Section& section,
             twoColumn = (section.members.count() >= 5);
         }
         if (twoColumn)
-            out() << "
\n"
-                  << "\n
";
+            out() << "\n"
+                  << "\n
";
         out() << "
\n";
 
         int i = 0;
@@ -3088,7 +3085,7 @@ void HtmlGenerator::generateSectionList(const Section& section,
             }
 
             if (twoColumn && i == (int) (section.members.count() + 1) / 2)
-                out() << "
\n";
+                out() << "
\n";
 
             out() << "
";
             if (style == CodeMarker::Accessors)
@@ -3102,7 +3099,7 @@ void HtmlGenerator::generateSectionList(const Section& section,
         }
         out() << "
\n";
         if (twoColumn)
-            out() << "
\n";
+            out() << "
\n";
     }
 
     if (style == CodeMarker::Summary && !section.inherited.isEmpty()) {
@@ -4274,15 +4271,15 @@ void HtmlGenerator::generateQmlSummary(const Section& section,
             twoColumn = (count >= 5);
         }
         if (twoColumn)
-            out() << "
\n"
-                  << "\n
";
+            out() << "\n"
+                  << "\n
";
         out() << "
\n";
 
         int row = 0;
         m = section.members.begin();
         while (m != section.members.end()) {
             if (twoColumn && row == (int) (count + 1) / 2)
-                out() << "
\n";
+                out() << "
\n";
             out() << "
";
             generateQmlItem(*m,relative,marker,true);
             out() << "
\n";
@@ -4291,7 +4288,7 @@ void HtmlGenerator::generateQmlSummary(const Section& section,
         }
         out() << "
\n";
         if (twoColumn)
-            out() << "
\n";
+            out() << "
\n";
     }
 }
 
@@ -4383,7 +4380,7 @@ void HtmlGenerator::generateQmlInherits(const QmlClassNode* cn,
             const Node* n = myTree->findNode(strList,Node::Fake);
             if (n && n->subType() == Node::QmlClass) {
                 const QmlClassNode* qcn = static_cast(n);
-                out() << "
";
+                out() << "
";
                 Text text;
                 text << "[Inherits ";
                 text << Atom(Atom::LinkNode,CodeMarker::stringForNode(qcn));
@@ -4430,7 +4427,7 @@ void HtmlGenerator::generateQmlInstantiates(const QmlClassNode* qcn,
 {
     const ClassNode* cn = qcn->classNode();
     if (cn && (cn->status() != Node::Internal)) {
-        out() << "
";
+        out() << "
";
         Text text;
         text << "[";
         text << Atom(Atom::LinkNode,CodeMarker::stringForNode(qcn));
@@ -4461,7 +4458,7 @@ void HtmlGenerator::generateInstantiatedBy(const ClassNode* cn,
     if (cn &&  cn->status() != Node::Internal && !cn->qmlElement().isEmpty()) {
         const Node* n = myTree->root()->findNode(cn->qmlElement(),Node::Fake);
         if (n && n->subType() == Node::QmlClass) {
-            out() << "
";
+            out() << "
";
             Text text;
             text << "[";
             text << Atom(Atom::LinkNode,CodeMarker::stringForNode(cn));
diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf
index 67a25f3..158aef3 100644
--- a/tools/qdoc3/test/qt-html-templates.qdocconf
+++ b/tools/qdoc3/test/qt-html-templates.qdocconf
@@ -2,7 +2,7 @@ HTML.stylesheets        = style/style.css
 HTML.postheader         = " 
\n" \
 			  "    
\n" \
 			  "      Home
\n" \
-			  "    Qt Reference Documentation\n" \
+			  "    Qt Reference Documentation\n" \
 			  "    
\n" \
 			  "      
\n" \
 			  "        
Qt HOME
\n" \
@@ -16,8 +16,8 @@ HTML.postheader         = " 
\n" \
 			  "    
\n" \
 			  "    
\n" \
 			  "      
\n" \
-			  "        
VERSION 4.7
\n" \
-			  "        
ALL QT VERSIONS" \
+			  "        
Qt 4.7
\n" \
+			  "        
ALL Qt VERSIONS" \
 			  "        
\n" \
 			  "      
\n" \
 			  "    
\n" \
@@ -73,9 +73,9 @@ HTML.postheader         = " 
\n" \
 			  "            
\n" \
 			  "              
All examples
\n" \
 			  "              
All tutorials
\n" \
-			  "              
Qt Quick examples
\n" \
-			  "              
Desktop examples
\n" \
-			  "              
Device examples
\n" \
+			  "              
Qt Quick examples
\n" \
+			  "              
Desktop examples
\n" \
+			  "              
Device examples
\n" \
 			  "            
\n" \
 			  "          
\n" \
 			  "          
\n" \
@@ -96,7 +96,7 @@ HTML.postheader         = " 
\n" \
 			  "              
A
\n" \
 			  "              
A
\n" \
 			  "              
\n" \
-			  "                
\n" \
+			  "                \n" \
 			  "            
\n" \
 			  "          
\n" \
 			  "        
\n" \
@@ -110,7 +110,6 @@ HTML.footer             = "        
\n" \
 			  "    
\n" \
 			  "      \n" \
 			  "    
\n" \
-			  "  \n" \
 			  "  
\n" \
 			  "    
\n" \
 			  "      © 2008-2010 Nokia Corporation and/or its\n" \
@@ -121,10 +120,10 @@ HTML.footer             = "        
\n" \
 			  "        href=\"http://qt.nokia.com/about/privacy-policy\">Privacy Policy
\n" \
 			  "  \n" \
 			  "  
\n" \
-			  "    
\n" \
 			  "      
\n" \
 			  "        X\n" \
 			  "      
\n" \
+			  "    \n" \
 			  "      Please submit you feedback...\n" \
 			  "      \n" \
@@ -132,7 +131,6 @@ HTML.footer             = "        
\n" \
 			  "  \n" \
 			  "  
\n" \
 			  "  
\n" \
-			  "  \n" \
 			  "\n";
-    out() << "  \n";
+	out() << "	\n";
     out() << "\n";
 
     if (offlineDocs)
-        out() << "\n";
+        out() << "\n";
     else
-        out() << "\n";
+        out() << "\n";
 
 #ifdef GENERATE_MAC_REFS    
     if (mainPage)
@@ -1833,18 +1845,16 @@ void HtmlGenerator::generateTitle(const QString& title,
                                   CodeMarker *marker)
 {
     if (!title.isEmpty())
-        out() << "
" << protectEnc(title);
+        out() << "
" << protectEnc(title) << "
\n";
     if (!subTitle.isEmpty()) {
-        out() << "
";
-        if (subTitleSize == SmallSubTitle)
-            out() << "";
+ 			out() << "";
         else
-            out() << "";
+            out() << " class=\"subtitle\">";
         generateText(subTitle, relative, marker);
         out() << "\n";
     }
-    if (!title.isEmpty())
-        out() << "\n";
 }
 
 void HtmlGenerator::generateFooter(const Node *node)
@@ -1853,9 +1863,10 @@ void HtmlGenerator::generateFooter(const Node *node)
         out() << "
\n" << navigationLinks << "
\n";
 
     out() << QString(footer).replace("\\" + COMMAND_VERSION, myTree->version())
-          << QString(address).replace("\\" + COMMAND_VERSION, myTree->version())
-          << "\n"
-             "\n";
+          << QString(address).replace("\\" + COMMAND_VERSION, myTree->version());
+	      out() << "  \n";
+          out() << "\n";
+          out() <<   "\n";
 }
 
 void HtmlGenerator::generateBrief(const Node *node, CodeMarker *marker,
@@ -1876,7 +1887,7 @@ void HtmlGenerator::generateBrief(const Node *node, CodeMarker *marker,
 void HtmlGenerator::generateIncludes(const InnerNode *inner, CodeMarker *marker)
 {
     if (!inner->includes().isEmpty()) {
-        out() << "
"
+        out() << "
"
               << trimmedTrailing(highlightedCode(indent(codeIndent,
                                                         marker->markedUpIncludes(inner->includes())),
                                                  marker,inner))
@@ -3766,7 +3777,7 @@ void HtmlGenerator::generateDetailedMember(const Node *node,
         out() << "
";
         out() << "";
         generateSynopsis(enume, relative, marker, CodeMarker::Detailed);
-        out() << "
";
+        out() << "
";
         generateSynopsis(enume->flagsType(),
                          relative,
                          marker,
diff --git a/tools/qdoc3/test/assistant.qdocconf b/tools/qdoc3/test/assistant.qdocconf
index 1deefce..112b1b2 100644
--- a/tools/qdoc3/test/assistant.qdocconf
+++ b/tools/qdoc3/test/assistant.qdocconf
@@ -16,45 +16,28 @@ qhp.Assistant.file                = assistant.qhp
 qhp.Assistant.namespace           = com.trolltech.assistant.470
 qhp.Assistant.virtualFolder       = qdoc
 qhp.Assistant.indexTitle          = Qt Assistant Manual
-qhp.Assistant.extraFiles          = images/api_examples.png \
-                             	    images/api_lookup.png \
-                             	    images/api_topics.png \
+qhp.Assistant.extraFiles          = 									images/bg_l.png \
                              	    images/bg_l_blank.png \
-			     	    images/bg_ll_blank.png \
-                             	    images/bg_ll.png \
-                             	    images/bg_l.png \
-                             	    images/bg_lr.png \
                              	    images/bg_r.png \
-                             	    images/bg_ul_blank.png \
-                             	    images/bg_ul.png \
-                             	    images/bg_ur_blank.png \
-                             	    images/bg_ur.png \
-			     	    images/box_bg.png \
-                             	    images/breadcrumb.png \
+									images/box_bg.png \
+									images/breadcrumb.png \
+									images/bullet_gt.png \
                              	    images/bullet_dn.png \
-                             	    images/bullet_gt.png \
-                             	    images/bullet_sq.png \
+									images/bullet_sq.png \
                              	    images/bullet_up.png \
-                             	    images/coloreditorfactoryimage.png \
-                             	    images/content_bg.png \
-                             	    images/dynamiclayouts-example.png \
                              	    images/feedbackground.png \
-                             	    images/form_bg.png \
                              	    images/horBar.png \
-                             	    images/page_bg.png \
-                             	    images/print.png \
-                             	    images/qt_guide.png \
-                             	    images/qt_icon.png \
-                             	    images/qt-logo.png \
-                             	    images/qt_ref_doc.png \
-                             	    images/qt_tools.png \
-                             	    images/sep.png \
-                             	    images/sprites-combined.png \
+									images/page.png \
+									images/page_bg.png \
+									images/sprites-combined.png \
                              	    images/stylesheet-coffee-plastique.png \
                              	    images/taskmenuextension-example.png \
-			     	    scripts/functions.js \
-			     	    scripts/jquery.js \
+                             	   images/coloreditorfactoryimage.png \
+                             	   images/dynamiclayouts-example.png \
+									scripts/functions.js \
+									scripts/jquery.js \
                              	    style/style.css
+
 qhp.Assistant.filterAttributes    = qt 4.7.0 tools assistant
 qhp.Assistant.customFilters.Assistant.name = Qt Assistant Manual
 qhp.Assistant.customFilters.Assistant.filterAttributes = qt tools assistant
diff --git a/tools/qdoc3/test/designer.qdocconf b/tools/qdoc3/test/designer.qdocconf
index 513801a..d4da292 100644
--- a/tools/qdoc3/test/designer.qdocconf
+++ b/tools/qdoc3/test/designer.qdocconf
@@ -16,45 +16,28 @@ qhp.Designer.file                = designer.qhp
 qhp.Designer.namespace           = com.trolltech.designer.470
 qhp.Designer.virtualFolder       = qdoc
 qhp.Designer.indexTitle          = Qt Designer Manual
-qhp.Designer.extraFiles          = images/api_examples.png \
-                             	   images/api_lookup.png \
-                             	   images/api_topics.png \
-                             	   images/bg_l_blank.png \
-			     	   images/bg_ll_blank.png \
-                             	   images/bg_ll.png \
-                             	   images/bg_l.png \
-                             	   images/bg_lr.png \
-                             	   images/bg_r.png \
-                             	   images/bg_ul_blank.png \
-                             	   images/bg_ul.png \
-                             	   images/bg_ur_blank.png \
-                             	   images/bg_ur.png \
-			     	   images/box_bg.png \
-                             	   images/breadcrumb.png \
-                             	   images/bullet_dn.png \
-                             	   images/bullet_gt.png \
-                             	   images/bullet_sq.png \
-                             	   images/bullet_up.png \
+qhp.Designer.extraFiles          = images/bg_l.png \
+                             	    images/bg_l_blank.png \
+                             	    images/bg_r.png \
+									images/box_bg.png \
+									images/breadcrumb.png \
+									images/bullet_gt.png \
+                             	    images/bullet_dn.png \
+									images/bullet_sq.png \
+                             	    images/bullet_up.png \
+                             	    images/feedbackground.png \
+                             	    images/horBar.png \
+									images/page.png \
+									images/page_bg.png \
+									images/sprites-combined.png \
+                             	    images/stylesheet-coffee-plastique.png \
+                             	    images/taskmenuextension-example.png \
                              	   images/coloreditorfactoryimage.png \
-                             	   images/content_bg.png \
                              	   images/dynamiclayouts-example.png \
-                             	   images/feedbackground.png \
-                             	   images/form_bg.png \
-                             	   images/horBar.png \
-                             	   images/page_bg.png \
-                             	   images/print.png \
-                             	   images/qt_guide.png \
-                             	   images/qt_icon.png \
-                             	   images/qt-logo.png \
-                             	   images/qt_ref_doc.png \
-                             	   images/qt_tools.png \
-                             	   images/sep.png \
-                             	   images/sprites-combined.png \
-                             	   images/stylesheet-coffee-plastique.png \
-                             	   images/taskmenuextension-example.png \
-			     	   scripts/functions.js \
-			     	   scripts/jquery.js \
-                             	   style/style.css
+									scripts/functions.js \
+									scripts/jquery.js \
+                             	    style/style.css
+
 qhp.Designer.filterAttributes    = qt 4.7.0 tools designer
 qhp.Designer.customFilters.Designer.name = Qt Designer Manual
 qhp.Designer.customFilters.Designer.filterAttributes = qt tools designer
diff --git a/tools/qdoc3/test/linguist.qdocconf b/tools/qdoc3/test/linguist.qdocconf
index a3f4f00..7420b4f 100644
--- a/tools/qdoc3/test/linguist.qdocconf
+++ b/tools/qdoc3/test/linguist.qdocconf
@@ -16,45 +16,28 @@ qhp.Linguist.file                = linguist.qhp
 qhp.Linguist.namespace           = com.trolltech.linguist.470
 qhp.Linguist.virtualFolder       = qdoc
 qhp.Linguist.indexTitle          = Qt Linguist Manual
-qhp.Linguist.extraFiles          = images/api_examples.png \
-                             	   images/api_lookup.png \
-                             	   images/api_topics.png \
-                             	   images/bg_l_blank.png \
-			     	   images/bg_ll_blank.png \
-                             	   images/bg_ll.png \
-                             	   images/bg_l.png \
-                             	   images/bg_lr.png \
-                             	   images/bg_r.png \
-                             	   images/bg_ul_blank.png \
-                             	   images/bg_ul.png \
-                             	   images/bg_ur_blank.png \
-                             	   images/bg_ur.png \
-			     	   images/box_bg.png \
-                             	   images/breadcrumb.png \
-                             	   images/bullet_dn.png \
-                             	   images/bullet_gt.png \
-                             	   images/bullet_sq.png \
-                             	   images/bullet_up.png \
+qhp.Linguist.extraFiles          = images/bg_l.png \
+                             	    images/bg_l_blank.png \
+                             	    images/bg_r.png \
+									images/box_bg.png \
+									images/breadcrumb.png \
+									images/bullet_gt.png \
+                             	    images/bullet_dn.png \
+									images/bullet_sq.png \
+                             	    images/bullet_up.png \
+                             	    images/feedbackground.png \
+                             	    images/horBar.png \
+									images/page.png \
+									images/page_bg.png \
+									images/sprites-combined.png \
+                             	    images/stylesheet-coffee-plastique.png \
+                             	    images/taskmenuextension-example.png \
                              	   images/coloreditorfactoryimage.png \
-                             	   images/content_bg.png \
                              	   images/dynamiclayouts-example.png \
-                             	   images/feedbackground.png \
-                             	   images/form_bg.png \
-                             	   images/horBar.png \
-                             	   images/page_bg.png \
-                             	   images/print.png \
-                             	   images/qt_guide.png \
-                             	   images/qt_icon.png \
-                             	   images/qt-logo.png \
-                             	   images/qt_ref_doc.png \
-                             	   images/qt_tools.png \
-                             	   images/sep.png \
-                             	   images/sprites-combined.png \
-                             	   images/stylesheet-coffee-plastique.png \
-                             	   images/taskmenuextension-example.png \
-			     	   scripts/functions.js \
-			     	   scripts/jquery.js \
-                             	   style/style.css
+									scripts/functions.js \
+									scripts/jquery.js \
+                             	    style/style.css
+
 qhp.Linguist.filterAttributes    = qt 4.7.0 tools linguist
 qhp.Linguist.customFilters.Linguist.name = Qt Linguist Manual
 qhp.Linguist.customFilters.Linguist.filterAttributes = qt tools linguist
diff --git a/tools/qdoc3/test/qdeclarative.qdocconf b/tools/qdoc3/test/qdeclarative.qdocconf
index 80050e3..8015f57 100644
--- a/tools/qdoc3/test/qdeclarative.qdocconf
+++ b/tools/qdoc3/test/qdeclarative.qdocconf
@@ -27,45 +27,27 @@ qhp.Qml.indexTitle          = Qml Reference
 
 # Files not referenced in any qdoc file
 # See also extraimages.HTML
-qhp.Qml.extraFiles            = images/api_examples.png \
-                             	images/api_lookup.png \
-                             	images/api_topics.png \
-                             	images/bg_l_blank.png \
-			     	images/bg_ll_blank.png \
-                             	images/bg_ll.png \
-                             	images/bg_l.png \
-                             	images/bg_lr.png \
-                             	images/bg_r.png \
-                             	images/bg_ul_blank.png \
-                             	images/bg_ul.png \
-                             	images/bg_ur_blank.png \
-                             	images/bg_ur.png \
-			     	images/box_bg.png \
-                             	images/breadcrumb.png \
-                             	images/bullet_dn.png \
-                             	images/bullet_gt.png \
-                             	images/bullet_sq.png \
-                             	images/bullet_up.png \
-                             	images/coloreditorfactoryimage.png \
-                             	images/content_bg.png \
-                             	images/dynamiclayouts-example.png \
-                             	images/feedbackground.png \
-                             	images/form_bg.png \
-                             	images/horBar.png \
-                             	images/page_bg.png \
-                             	images/print.png \
-                             	images/qt_guide.png \
-                             	images/qt_icon.png \
-                             	images/qt-logo.png \
-                             	images/qt_ref_doc.png \
-                             	images/qt_tools.png \
-                             	images/sep.png \
-                             	images/sprites-combined.png \
-                             	images/stylesheet-coffee-plastique.png \
-                             	images/taskmenuextension-example.png \
-			     	scripts/functions.js \
-			     	scripts/jquery.js \
-                             	style/style.css
+qhp.Qml.extraFiles            = images/bg_l.png \
+                             	    images/bg_l_blank.png \
+                             	    images/bg_r.png \
+									images/box_bg.png \
+									images/breadcrumb.png \
+									images/bullet_gt.png \
+                             	    images/bullet_dn.png \
+									images/bullet_sq.png \
+                             	    images/bullet_up.png \
+                             	    images/feedbackground.png \
+                             	    images/horBar.png \
+									images/page.png \
+									images/page_bg.png \
+									images/sprites-combined.png \
+                             	    images/stylesheet-coffee-plastique.png \
+                             	    images/taskmenuextension-example.png \
+                             	   images/coloreditorfactoryimage.png \
+                             	   images/dynamiclayouts-example.png \
+									scripts/functions.js \
+									scripts/jquery.js \
+                             	    style/style.css
 
 qhp.Qml.filterAttributes    = qt 4.6.0 qtrefdoc
 qhp.Qml.customFilters.Qt.name = Qt 4.6.0
diff --git a/tools/qdoc3/test/qmake.qdocconf b/tools/qdoc3/test/qmake.qdocconf
index f38a2a4..49d088e 100644
--- a/tools/qdoc3/test/qmake.qdocconf
+++ b/tools/qdoc3/test/qmake.qdocconf
@@ -16,45 +16,28 @@ qhp.qmake.file                = qmake.qhp
 qhp.qmake.namespace           = com.trolltech.qmake.470
 qhp.qmake.virtualFolder       = qdoc
 qhp.qmake.indexTitle          = QMake Manual
-qhp.qmake.extraFiles          = images/api_examples.png \
-                             	images/api_lookup.png \
-                             	images/api_topics.png \
-                             	images/bg_l_blank.png \
-			     	images/bg_ll_blank.png \
-                             	images/bg_ll.png \
-                             	images/bg_l.png \
-                             	images/bg_lr.png \
-                             	images/bg_r.png \
-                             	images/bg_ul_blank.png \
-                             	images/bg_ul.png \
-                             	images/bg_ur_blank.png \
-                             	images/bg_ur.png \
-			     	images/box_bg.png \
-                             	images/breadcrumb.png \
-                             	images/bullet_dn.png \
-                             	images/bullet_gt.png \
-                             	images/bullet_sq.png \
-                             	images/bullet_up.png \
-                             	images/coloreditorfactoryimage.png \
-                             	images/content_bg.png \
-                             	images/dynamiclayouts-example.png \
-                             	images/feedbackground.png \
-                             	images/form_bg.png \
-                             	images/horBar.png \
-                             	images/page_bg.png \
-                             	images/print.png \
-                             	images/qt_guide.png \
-                             	images/qt_icon.png \
-                             	images/qt-logo.png \
-                             	images/qt_ref_doc.png \
-                             	images/qt_tools.png \
-                             	images/sep.png \
-                             	images/sprites-combined.png \
-                             	images/stylesheet-coffee-plastique.png \
-                             	images/taskmenuextension-example.png \
-			     	scripts/functions.js \
-			     	scripts/jquery.js \
-                             	style/style.css
+qhp.qmake.extraFiles          = images/bg_l.png \
+                             	    images/bg_l_blank.png \
+                             	    images/bg_r.png \
+									images/box_bg.png \
+									images/breadcrumb.png \
+									images/bullet_gt.png \
+                             	    images/bullet_dn.png \
+									images/bullet_sq.png \
+                             	    images/bullet_up.png \
+                             	    images/feedbackground.png \
+									images/horBar.png \
+									images/page.png \
+									images/page_bg.png \
+									images/sprites-combined.png \
+                             	    images/stylesheet-coffee-plastique.png \
+                             	    images/taskmenuextension-example.png \
+                             	   images/coloreditorfactoryimage.png \
+                             	   images/dynamiclayouts-example.png \
+									scripts/functions.js \
+									scripts/jquery.js \
+                             	    style/style.css
+
 qhp.qmake.filterAttributes    = qt 4.7.0 tools qmake
 qhp.qmake.customFilters.qmake.name = qmake Manual
 qhp.qmake.customFilters.qmake.filterAttributes = qt tools qmake
diff --git a/tools/qdoc3/test/qt-build-docs.qdocconf b/tools/qdoc3/test/qt-build-docs.qdocconf
index 0694748..f0c2535 100644
--- a/tools/qdoc3/test/qt-build-docs.qdocconf
+++ b/tools/qdoc3/test/qt-build-docs.qdocconf
@@ -22,45 +22,27 @@ qhp.Qt.indexTitle          = Qt Reference Documentation
 # Files not referenced in any qdoc file (last four are needed by qtdemo)
 # See also extraimages.HTML
 qhp.Qt.extraFiles          = index.html \
-                             images/api_examples.png \
-                             images/api_lookup.png \
-                             images/api_topics.png \
-                             images/bg_l_blank.png \
-			     images/bg_ll_blank.png \
-                             images/bg_ll.png \
-                             images/bg_l.png \
-                             images/bg_lr.png \
-                             images/bg_r.png \
-                             images/bg_ul_blank.png \
-                             images/bg_ul.png \
-                             images/bg_ur_blank.png \
-                             images/bg_ur.png \
-			     images/box_bg.png \
-                             images/breadcrumb.png \
-                             images/bullet_dn.png \
-                             images/bullet_gt.png \
-                             images/bullet_sq.png \
-                             images/bullet_up.png \
-                             images/coloreditorfactoryimage.png \
-                             images/content_bg.png \
-                             images/dynamiclayouts-example.png \
-                             images/feedbackground.png \
-                             images/form_bg.png \
-                             images/horBar.png \
-                             images/page_bg.png \
-                             images/print.png \
-                             images/qt_guide.png \
-                             images/qt_icon.png \
-                             images/qt-logo.png \
-                             images/qt_ref_doc.png \
-                             images/qt_tools.png \
-                             images/sep.png \
-                             images/sprites-combined.png \
-                             images/stylesheet-coffee-plastique.png \
-                             images/taskmenuextension-example.png \
-			     scripts/functions.js \
-			     scripts/jquery.js \
-                             style/style.css
+ 									images/bg_l.png \
+                             	    images/bg_l_blank.png \
+                             	    images/bg_r.png \
+									images/box_bg.png \
+									images/breadcrumb.png \
+									images/bullet_gt.png \
+                             	    images/bullet_dn.png \
+									images/bullet_sq.png \
+                             	    images/bullet_up.png \
+                             	    images/feedbackground.png \
+                             	    images/horBar.png \
+									images/page.png \
+									images/page_bg.png \
+									images/sprites-combined.png \
+                             	    images/stylesheet-coffee-plastique.png \
+                             	    images/taskmenuextension-example.png \
+                             	   images/coloreditorfactoryimage.png \
+                             	   images/dynamiclayouts-example.png \
+									scripts/functions.js \
+									scripts/jquery.js \
+                             	    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 5a3d726..a00d5a1 100644
--- a/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf
+++ b/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf
@@ -30,45 +30,27 @@ qhp.Qt.customFilters.Qt.filterAttributes = qt 4.7.0
 # Files not referenced in any qdoc file (last four are needed by qtdemo)
 # See also extraimages.HTML
 qhp.Qt.extraFiles          = index.html \
-                             images/api_examples.png \
-                             images/api_lookup.png \
-                             images/api_topics.png \
-                             images/bg_l_blank.png \
-			     images/bg_ll_blank.png \
-                             images/bg_ll.png \
-                             images/bg_l.png \
-                             images/bg_lr.png \
-                             images/bg_r.png \
-                             images/bg_ul_blank.png \
-                             images/bg_ul.png \
-                             images/bg_ur_blank.png \
-                             images/bg_ur.png \
-			     images/box_bg.png \
-                             images/breadcrumb.png \
-                             images/bullet_dn.png \
-                             images/bullet_gt.png \
-                             images/bullet_sq.png \
-                             images/bullet_up.png \
-                             images/coloreditorfactoryimage.png \
-                             images/content_bg.png \
-                             images/dynamiclayouts-example.png \
-                             images/feedbackground.png \
-                             images/form_bg.png \
-                             images/horBar.png \
-                             images/page_bg.png \
-                             images/print.png \
-                             images/qt_guide.png \
-                             images/qt_icon.png \
-                             images/qt-logo.png \
-                             images/qt_ref_doc.png \
-                             images/qt_tools.png \
-                             images/sep.png \
-                             images/sprites-combined.png \
-                             images/stylesheet-coffee-plastique.png \
-                             images/taskmenuextension-example.png \
-			     scripts/functions.js \
-			     scripts/jquery.js \
-                             style/style.css
+									images/bg_l.png \
+                             	    images/bg_l_blank.png \
+                             	    images/bg_r.png \
+									images/box_bg.png \
+									images/breadcrumb.png \
+									images/bullet_gt.png \
+                             	    images/bullet_dn.png \
+									images/bullet_sq.png \
+                             	    images/bullet_up.png \
+                             	    images/feedbackground.png \									
+                             	    images/horBar.png \									
+									images/page.png \
+									images/page_bg.png \
+									images/sprites-combined.png \
+                             	    images/stylesheet-coffee-plastique.png \
+                             	    images/taskmenuextension-example.png \
+                             	   images/coloreditorfactoryimage.png \
+                             	   images/dynamiclayouts-example.png \
+									scripts/functions.js \
+									scripts/jquery.js \
+                             	    style/style.css
 
 language                = Cpp
 
diff --git a/tools/qdoc3/test/qt-defines.qdocconf b/tools/qdoc3/test/qt-defines.qdocconf
index 0426f4d..dc81757 100644
--- a/tools/qdoc3/test/qt-defines.qdocconf
+++ b/tools/qdoc3/test/qt-defines.qdocconf
@@ -20,37 +20,20 @@ codeindent              = 1
 # See also qhp.Qt.extraFiles
 extraimages.HTML        = qt-logo \
                           trolltech-logo \
-			  api_examples.png \
-			  bg_ll.png \
-			  bg_ul_blank.png \
-			  bullet_gt.png \
-			  horBar.png \
-			  qt_ref_doc.png \
-			  api_lookup.png \
-			  bg_ll_blank.png \
-			  bg_ur.png \
-			  bullet_sq.png \
-			  bullet_dn.png \
-			  bullet_up.png \
-			  page_bg.png \
-			  qt_tools.png \
-			  api_topics.png \
-			  bg_lr.png \
-			  bg_ur_blank.png \
-			  content_bg.png \
-			  print.png \
-			  sep.png \
-			  bg_l.png \
-			  bg_r.png \
-			  box_bg.png \
-			  feedbackground.png \
-			  qt_guide.png \
-			  sprites-combined.png \
-			  bg_l_blank.png \
-			  bg_ul.png \
-			  breadcrumb.png \
-			  form_bg.png \
-			  qt_icon.png \
+						bg_l.png \
+                        bg_l_blank.png \
+                        bg_r.png \
+						box_bg.png \
+						breadcrumb.png \
+						bullet_gt.png \
+                        bullet_dn.png \
+						bullet_sq.png \
+                        bullet_up.png \
+                        feedbackground.png \
+                        horBar.png \
+						page.png \
+						page_bg.png \
+						sprites-combined.png \
                           taskmenuextension-example.png \
                           coloreditorfactoryimage.png \
                           dynamiclayouts-example.png \
diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf
index 0651176..00af376 100644
--- a/tools/qdoc3/test/qt-html-templates.qdocconf
+++ b/tools/qdoc3/test/qt-html-templates.qdocconf
@@ -33,30 +33,38 @@ HTML.postheader         = " 
\n" \
 			  "        
\n" \
 			  "          \n" \
 			  "            
\n" \
-			  "              \n" \
+			  "              \n" \
 			  "            
\n" \
 			  "          \n" \
 			  "        
\n" \
 			  "        
\n" \
-			  "          
\n" \
+			  "          
\n" \
 			  "            API Lookup
\n" \
-			  "          
\n" \
-			  "            
\n" \
+			  "          
\n" \
+			  " \n " \
+			  " " \
+			  "          
\n" \
 			  "              
All modules
\n" \
 			  "              
All classes
\n" \
 			  "              
All functions
\n" \
 			  "              
All namespaces
\n" \
 			  "              
Platform specifics
\n" \
-			  "            
\n" \
+			  "            
 \n" \
 			  "          
\n" \
-			  "          
\n" \
+			  "          
\n" \
 			  "          
\n" \
 			  "        
\n" \
 			  "        
\n" \
-			  "          
\n" \
+			  "          
\n" \
 			  "            API Topics
\n" \
-			  "          
\n" \
-			  "            
\n" \
+			  "          
\n" \
+			  " \n " \
+			  " " \
+			  "            
\n" \
 			  "              
QObject model
\n" \
 			  "              
Signals & Slots
\n" \
 			  "              
Event handling
\n" \
@@ -67,24 +75,29 @@ HTML.postheader         = " 
\n" \
 			  "              
The paint system
\n" \
 			  "              
Graphics views
\n" \
 			  "              
Model/View programming
\n" \
-			  "            
\n" \
+			  "              
Widget style & layout
\n" \
+			  "            
  \n" \
 			  "          
\n" \
-			  "          
\n" \
+			  "          
\n" \
 			  "          
\n" \
 			  "        
\n" \
 			  "        
\n" \
-			  "          
\n" \
+			  "          
\n" \
 			  "            API Examples
\n" \
-			  "          
\n" \
-			  "            
\n" \
+			  "          
\n" \
+			  "  \n " \
+			  " " \
+			  "        
\n" \
 			  "              
All examples
\n" \
 			  "              
All tutorials
\n" \
 			  "              
Qt Quick examples
\n" \
 			  "              
Desktop examples
\n" \
 			  "              
Device examples
\n" \
-			  "            
\n" \
+			  "            
 \n" \
 			  "          
\n" \
-			  "          
\n" \
+			  "          
\n" \
 			  "          
\n" \
 			  "        
\n" \
 			  "      
\n" \
@@ -103,13 +116,13 @@ HTML.postpostheader     = "            \n" \
 			  "              
A
\n" \
 			  "              
A
\n" \
 			  "              
\n" \
-			  "                
\n" \
+			  "                Print\n" \
 			  "            \n" \
 			  "          
\n" \
 			  "        
\n" \
 			  "        
\n"
 
-HTML.footer             = "        
\n" \
+HTML.footer             = "        \n" \
 			  "        
\n" \
 			  "          [+] Documentation Feedback
\n" \
 			  "      
\n" \
@@ -117,6 +130,7 @@ HTML.footer             = "        \n" \
 			  "    
\n" \
 			  "      \n" \
 			  "    
\n" \
+			  "   \n" \
 			  "  
\n" \
 			  "    
\n" \
 			  "      © 2008-2010 Nokia Corporation and/or its\n" \
@@ -131,14 +145,14 @@ HTML.footer             = "        
\n" \
 			  "        X\n" \
 			  "      \n" \
 			  "    
\n" \
-			  "      Please submit you feedback...\n" \
-			  "      \n" \
+			  "      
Please submit you feedback...
\n" \
+			  "      
\n" \
 			  "    
\n" \
 			  "  \n" \
 			  "  
\n" \
 			  "  
\n" \
-			  " -->\n"
diff --git a/tools/qdoc3/test/qt.qdocconf b/tools/qdoc3/test/qt.qdocconf
index 69ab4e1..59dd855 100644
--- a/tools/qdoc3/test/qt.qdocconf
+++ b/tools/qdoc3/test/qt.qdocconf
@@ -26,45 +26,27 @@ qhp.Qt.indexRoot           =
 # Files not referenced in any qdoc file (last four are needed by qtdemo)
 # See also extraimages.HTML
 qhp.Qt.extraFiles          = index.html \
-                             images/api_examples.png \
-                             images/api_lookup.png \
-                             images/api_topics.png \
-                             images/bg_l_blank.png \
-			     images/bg_ll_blank.png \
-                             images/bg_ll.png \
-                             images/bg_l.png \
-                             images/bg_lr.png \
-                             images/bg_r.png \
-                             images/bg_ul_blank.png \
-                             images/bg_ul.png \
-                             images/bg_ur_blank.png \
-                             images/bg_ur.png \
-			     images/box_bg.png \
-                             images/breadcrumb.png \
-                             images/bullet_dn.png \
-                             images/bullet_gt.png \
-                             images/bullet_sq.png \
-                             images/bullet_up.png \
-                             images/coloreditorfactoryimage.png \
-                             images/content_bg.png \
-                             images/dynamiclayouts-example.png \
-                             images/feedbackground.png \
-                             images/form_bg.png \
-                             images/horBar.png \
-                             images/page_bg.png \
-                             images/print.png \
-                             images/qt_guide.png \
-                             images/qt_icon.png \
-                             images/qt-logo.png \
-                             images/qt_ref_doc.png \
-                             images/qt_tools.png \
-                             images/sep.png \
-                             images/sprites-combined.png \
-                             images/stylesheet-coffee-plastique.png \
-                             images/taskmenuextension-example.png \
-			     scripts/functions.js \
-			     scripts/jquery.js \
-                             style/style.css
+									images/bg_l.png \
+                             	    images/bg_l_blank.png \
+                             	    images/bg_r.png \
+									images/box_bg.png \
+									images/breadcrumb.png \
+									images/bullet_gt.png \
+                             	    images/bullet_dn.png \
+									images/bullet_sq.png \
+                             	    images/bullet_up.png \
+                             	    images/feedbackground.png \
+                             	    images/horBar.png \
+									images/page.png \
+									images/page_bg.png \
+									images/sprites-combined.png \
+                             	    images/stylesheet-coffee-plastique.png \
+                             	    images/taskmenuextension-example.png \
+                             	   images/coloreditorfactoryimage.png \
+                             	   images/dynamiclayouts-example.png \
+									scripts/functions.js \
+									scripts/jquery.js \
+                             	    style/style.css
 
 qhp.Qt.filterAttributes    = qt 4.7.0 qtrefdoc
 qhp.Qt.customFilters.Qt.name = Qt 4.7.0
diff --git a/tools/qdoc3/test/qt_zh_CN.qdocconf b/tools/qdoc3/test/qt_zh_CN.qdocconf
index a5a65d8..9275b5c 100644
--- a/tools/qdoc3/test/qt_zh_CN.qdocconf
+++ b/tools/qdoc3/test/qt_zh_CN.qdocconf
@@ -32,45 +32,27 @@ qhp.Qt.customFilters.Qt.filterAttributes = qt 4.7.0
 # Files not referenced in any qdoc file (last four are needed by qtdemo)
 # See also extraimages.HTML
 qhp.Qt.extraFiles          = index.html \
-                             images/api_examples.png \
-                             images/api_lookup.png \
-                             images/api_topics.png \
-                             images/bg_l_blank.png \
-			     images/bg_ll_blank.png \
-                             images/bg_ll.png \
-                             images/bg_l.png \
-                             images/bg_lr.png \
-                             images/bg_r.png \
-                             images/bg_ul_blank.png \
-                             images/bg_ul.png \
-                             images/bg_ur_blank.png \
-                             images/bg_ur.png \
-			     images/box_bg.png \
-                             images/breadcrumb.png \
-                             images/bullet_dn.png \
-                             images/bullet_gt.png \
-                             images/bullet_sq.png \
-                             images/bullet_up.png \
-                             images/coloreditorfactoryimage.png \
-                             images/content_bg.png \
-                             images/dynamiclayouts-example.png \
-                             images/feedbackground.png \
-                             images/form_bg.png \
-                             images/horBar.png \
-                             images/page_bg.png \
-                             images/print.png \
-                             images/qt_guide.png \
-                             images/qt_icon.png \
-                             images/qt-logo.png \
-                             images/qt_ref_doc.png \
-                             images/qt_tools.png \
-                             images/sep.png \
-                             images/sprites-combined.png \
-                             images/stylesheet-coffee-plastique.png \
-                             images/taskmenuextension-example.png \
-			     scripts/functions.js \
-			     scripts/jquery.js \
-                             style/style.css
+									images/bg_l.png \
+                             	    images/bg_l_blank.png \
+                             	    images/bg_r.png \
+									images/box_bg.png \
+									images/breadcrumb.png \
+									images/bullet_gt.png \
+                             	    images/bullet_dn.png \
+									images/bullet_sq.png \
+                             	    images/bullet_up.png \
+                             	    images/feedbackground.png \									
+                             	    images/horBar.png \									
+									images/page.png \
+									images/page_bg.png \
+									images/sprites-combined.png \
+                             	    images/stylesheet-coffee-plastique.png \
+                             	    images/taskmenuextension-example.png \
+                             	   images/coloreditorfactoryimage.png \
+                             	   images/dynamiclayouts-example.png \
+									scripts/functions.js \
+									scripts/jquery.js \
+                             	    style/style.css
 
 language                = Cpp
 
diff --git a/tools/qdoc3/test/style/style.css b/tools/qdoc3/test/style/style.css
index 1ed49fa..9c290f5 100644
--- a/tools/qdoc3/test/style/style.css
+++ b/tools/qdoc3/test/style/style.css
@@ -58,6 +58,19 @@
     {
         vertical-align: baseline;
     }
+    .heading
+    {
+        font: normal 600 16px/1.0 Arial;
+        padding-bottom: 15px;
+    }
+    .subtitle
+    {
+        font-size: 13px;
+    }
+    .small-subtitle
+    {
+        font-size: 13px;
+    }
     legend
     {
         color: #000000;
@@ -73,7 +86,6 @@
     {
         font-size: 100%;
     }
-    /* Page style */
     html
     {
         background-color: #e5e5e5;
@@ -92,6 +104,11 @@
     {
         font-style: italic;
     }
+    a
+    {
+        color: #00732f;
+        text-decoration: none;
+    }
     .header, .footer, .wrapper
     {
         min-width: 600px;
@@ -106,23 +123,19 @@
     {
         padding-left: 216px;
         height: 15px;
-        background: url(../images/bg_ul.png) no-repeat 0 0;
+        background: url(../images/page.png) no-repeat 0 0;
         overflow: hidden;
     }
     .offline .wrapper .hd
     {
-        background: url(../images/bg_ul_blank.png) no-repeat 0 0;
+        background: url(../images/page.png) no-repeat 0 -15px;
     }
     .wrapper .hd span
     {
         height: 15px;
         display: block;
-        background: url(../images/bg_ur.png) no-repeat 100% 0;
         overflow: hidden;
-    }
-    .offline .wrapper .hd span
-    {
-        /*         background: url(../images/bg_ur_blank.png) no-repeat 100% 0; */
+        background: url(../images/page.png) no-repeat 100% -30px;
     }
     .wrapper .bd
     {
@@ -137,18 +150,18 @@
     {
         padding-left: 216px;
         height: 15px;
-        background: url(../images/bg_ll.png) no-repeat 0 0;
+        background: url(../images/page.png) no-repeat 0 -75px;
         overflow: hidden;
     }
     .offline .wrapper .ft
     {
-        background: url(../images/bg_ll_blank.png) no-repeat 0 0;
+        background: url(../images/page.png) no-repeat 0 -90px;
     }
     .wrapper .ft span
     {
         height: 15px;
         display: block;
-        background: url(../images/bg_lr.png) no-repeat 100% 0;
+        background: url(../images/page.png) no-repeat 100% -60px;
         overflow: hidden;
     }
     .header, .footer
@@ -182,186 +195,9 @@
         width: 302px;
         height: 22px;
         text-indent: -999em;
-        background: url(../images/header.png) no-repeat 0 0;
-    }
-    /* header elements */
-    #nav-topright
-    {
-        height: 70px;
-    }
-
-    #nav-topright ul
-    {
-        list-style-type: none;
-        float: right;
-        width: 370px;
-        margin-top: 11px;
-    }
-
-    #nav-topright li
-    {
-        display: inline-block;
-        margin-right: 20px;
-        float: left;
-    }
-
-    #nav-topright li.nav-topright-last
-    {
-        margin-right: 0;
-    }
-
-    #nav-topright li a
-    {
-        background: transparent url(../images/sprites-combined.png) no-repeat;
-        height: 18px;
-        display: block;
-        overflow: hidden;
-        text-indent: -9999px;
-    }
-
-    #nav-topright li.nav-topright-home a
-    {
-        width: 65px;
-        background-position: -2px -91px;
-    }
-
-    #nav-topright li.nav-topright-home a:hover
-    {
-        background-position: -2px -117px;
-    }
-
-
-    #nav-topright li.nav-topright-dev a
-    {
-        width: 30px;
-        background-position: -76px -91px;
-    }
-
-    #nav-topright li.nav-topright-dev a:hover
-    {
-        background-position: -76px -117px;
-    }
-
-
-    #nav-topright li.nav-topright-labs a
-    {
-        width: 40px;
-        background-position: -114px -91px;
-    }
-
-    #nav-topright li.nav-topright-labs a:hover
-    {
-        background-position: -114px -117px;
-    }
-
-    #nav-topright li.nav-topright-doc a
-    {
-        width: 32px;
-        background-position: -162px -91px;
-    }
-
-    #nav-topright li.nav-topright-doc a:hover, #nav-topright li.nav-topright-doc-active a
-    {
-        background-position: -162px -117px;
-    }
-
-    #nav-topright li.nav-topright-blog a
-    {
-        width: 40px;
-        background-position: -203px -91px;
-    }
-
-    #nav-topright li.nav-topright-blog a:hover, #nav-topright li.nav-topright-blog-active a
-    {
-        background-position: -203px -117px;
-    }
-
-    #nav-topright li.nav-topright-shop a
-    {
-        width: 40px;
-        background-position: -252px -91px;
-    }
-
-    #nav-topright li.nav-topright-shop a:hover, #nav-topright li.nav-topright-shop-active a
-    {
-        background-position: -252px -117px;
-    }
-
-    #nav-logo
-    {
-        background: transparent url(     "../images/sprites-combined.png" ) no-repeat 0 -225px;
-        left: -3px;
-        position: absolute;
-        width: 75px;
-        height: 75px;
-        top: 13px;
-    }
-    #nav-logo a
-    {
-        width: 75px;
-        height: 75px;
-        display: block;
-        text-indent: -9999px;
-        overflow: hidden;
-    }
-    /* Clearing */
-    .header:after, .footer:after, .breadcrumb:after, .wrap .content:after, .group:after
-    {
-        content: ".";
-        display: block;
-        height: 0;
-        clear: both;
-        visibility: hidden;
-    }
-    /* ^ Clearing */
-
-
-
-    .shortCut-topleft-inactive
-    {
-        padding-left: 3px;
-        background: transparent url(     "../images/sprites-combined.png" ) no-repeat 0px -58px;
-        height: 20px;
-        width: 93px;
-    }
-    .shortCut-topleft-inactive span
-    {
-        font-variant: normal;
-    }
-    #shortCut
-    {
-        padding-top: 10px;
-        font-weight: bolder;
-        color: #b0adab;
-    }
-    #shortCut ul
-    {
-        list-style-type: none;
-        float: left;
-        width: 347px;
-        margin-left: 100px;
-    }
-    #shortCut li
-    {
-        display: inline-block;
-        margin-right: 25px;
-        float: left;
-        white-space: nowrap;
-    }
-    #shortCut li a
-    {
-        color: #b0adab;
-        text-decoration: none;
-    }
-    #shortCut li a:hover
-    {
-        color: #44a51c;
-        text-decoration: none;
+        background: url(../images/sprites-combined.png) no-repeat -78px -235px;
     }
 
-    /* end of header elements */    
-    
-    /* menu element */
     .sidebar
     {
         float: left;
@@ -369,32 +205,32 @@
         width: 200px;
         font-size: 11px;
     }
-    .sidebar a
-    {
-        color: #00732f;
-        text-decoration: none;
-    }
-    .offline .sidebar, .offline .feedback
+
+    .offline .sidebar, .offline .feedback, .offline .t_button
     {
         display: none;
     }
+
     .sidebar .searchlabel
     {
         padding: 0 0 2px 17px;
         font: normal bold 11px/1.2 Verdana;
     }
+
     .sidebar .search
     {
         padding: 0 15px 0 16px;
     }
+
     .sidebar .search form
     {
-        width: 167px;
-        height: 21px;
-        padding: 2px 0 0 5px;
-        background: url(../images/form_bg.png) no-repeat 0 0;
+        background: url(../images/sprites-combined.png) no-repeat -6px -348px;
+		height:21px;
+		padding:2px 0 0 5px;
+		width:167px;
     }
-    .sidebar .search form fieldset input#searchstring
+
+    .sidebar .search form input#pageType
     {
         width: 158px;
         height: 19px;
@@ -403,32 +239,62 @@
         outline: none;
         font: 13px/1.2 Verdana;
     }
+
     .sidebar .box
     {
         padding: 17px 15px 5px 16px;
     }
+
     .sidebar .box .first
     {
         background-image: none;
     }
+
     .sidebar .box h2
     {
         font: normal 18px/1.2 Arial;
-        padding: 15px 0 0 40px;
+        padding: 0;
         min-height: 32px;
     }
+    .sidebar .box h2 span
+    {
+        overflow: hidden;
+        display: inline-block;
+    }
     .sidebar .box#lookup h2
     {
-        background: url(../images/api_lookup.png) no-repeat 0 0;
+        background-image: none;
+    }
+    .sidebar #lookup.box h2 span
+    {
+        background: url(../images/sprites-combined.png) no-repeat -6px -311px;
+        width: 27px;
+        height: 35px;
+        margin-right: 13px;
     }
     .sidebar .box#topics h2
     {
-        background: url(../images/api_topics.png) no-repeat 0 0;
+        background-image: none;
+    }
+    .sidebar #topics.box h2 span
+    {
+        background: url(../images/sprites-combined.png) no-repeat -94px -311px;
+        width: 27px;
+        height: 32px;
+        margin-right: 13px;
     }
     .sidebar .box#examples h2
     {
-        background: url(../images/api_examples.png) no-repeat 0 0;
+        background-image: none;
+    }
+    .sidebar #examples.box h2 span
+    {
+        background: url(../images/sprites-combined.png) no-repeat -48px -311px;
+        width: 30px;
+        height: 31px;
+        margin-right: 9px;
     }
+
     .sidebar .box .list
     {
         display: block;
@@ -443,6 +309,9 @@
     {
         text-decoration: underline;
     }
+    .sidebar .box ul
+    {
+    }
     .sidebar .box ul li
     {
         padding-left: 12px;
@@ -453,23 +322,20 @@
     {
         background: url(../images/box_bg.png) repeat-x 0 bottom;
     }
-    /* content elements */
     .wrap
     {
-        overflow: hidden;
+        margin: 0 5px 0 208px;
+        overflow: visible; 
     }
     .offline .wrap
     {
         margin: 0 5px 0 5px;
     }
-    /* tool bar */
     .wrap .toolbar
     {
         background-color: #fafafa;
         border-bottom: 1px solid #d1d1d1;
-        height: 20px;
-        margin-left: 3px;
-        margin-right: 5px;
+        height: 20px; 
         position: relative;
     }
     .wrap .toolbar .toolblock
@@ -487,7 +353,7 @@
     {
         padding: 0 0 10px 21px;
         right: 5px;
-        vertical-align: top;
+        vertical-align: middle;
         overflow: hidden;
     }
     .wrap .toolbar .toolbuttons .active
@@ -507,32 +373,56 @@
         font-weight: bold;
         color: #B0ADAB;
     }
-    #smallA
+
+    .toolbuttons #print
+    {
+        border-left: 1px solid #c5c4c4;
+        margin-top: 0;
+        padding-left: 7px;
+        text-indent: 0;
+    }
+    .toolbuttons #print a
+    {
+        width: 16px;
+        height: 16px;
+    }
+
+    .toolbuttons #print a span
+    {
+        width: 16px;
+        height: 16px;
+        text-indent: -999em;
+        display: block;
+        overflow: hidden;
+        background: url(../images/sprites-combined.png) no-repeat -137px -311px;
+    }
+
+    .toolbuttons #smallA
     {
         font-size: 10pt;
     }
-    #medA
+    .toolbuttons #medA
     {
         font-size: 12pt;
     }
-    #bigA
+    .toolbuttons #bigA
     {
         font-size: 14pt;
+        margin-right: 7px;
     }
+
     #smallA:hover, #medA:hover, #bigA:hover
     {
         color: #00732F;
     }
-    #print
+
+    .offline .wrap .breadcrumb
     {
-        font-size: 14pt;
-        line-height: 20pt;
     }
-    #printIcon
+
+    .wrap .breadcrumb ul
     {
-        margin-left: 5px;
     }
-    /* bread crumbs */
     .wrap .breadcrumb ul li
     {
         float: left;
@@ -545,6 +435,10 @@
     {
         font-weight: normal;
     }
+    .wrap .breadcrumb ul li a
+    {
+        color: #363534;
+    }
     .wrap .breadcrumb ul li.first
     {
         background-image: none;
@@ -554,29 +448,29 @@
     .wrap .content
     {
         padding: 30px;
-        position: relative;
     }
-    /* text elements */
-    .heading
+
+    .wrap .content li
     {
-        font: normal 600 16px/1.0 Arial;
-        padding-bottom: 15px;
+        padding-left: 12px;
+        background: url(../images/bullet_sq.png) no-repeat 0 5px;
+        font: normal 400 10pt/1 Verdana;
+        color: #44a51c;
+        margin-bottom: 10px; 
     }
-
-    .subtitle
+    .content li:hover
     {
-        font-size: 13px;
+        text-decoration: underline;
     }
 
-    .small-subtitle
+    .offline .wrap .content
     {
-        font-size: 13px;
+        padding-top: 15px;
     }
-    
+
     .wrap .content h1
     {
         font: 600 18px/1.2 Arial;
-        padding-bottom: 15px;
     }
     .wrap .content h2
     {
@@ -588,26 +482,13 @@
     }
     .wrap .content p
     {
-        line-height:20px;
-        padding:10px 5px 10px 5px;
+        line-height: 20px;
+        padding: 10px 5px 10px 5px;
     }
     .wrap .content ul
     {
         padding-left: 25px;
     }
-    .wrap .content li
-    {
-        padding-left: 12px;
-        background: url(../images/bullet_sq.png) no-repeat 0 5px;
-        font: normal 400 10pt/1 Verdana;
-        margin-bottom: 10px;
-        line-height: 14px;
-    }
-    a
-    {
-        color: #00732F;
-        text-decoration: none;
-    }
     a:hover
     {
         color: #4c0033;
@@ -618,10 +499,6 @@
         color: #4c0033;
         text-decoration: none;
     }
-    .offline .wrap .content
-    {
-        padding-top: 15px;
-    }
     .footer
     {
         min-height: 100px;
@@ -629,11 +506,15 @@
         font: normal 9px/1 Verdana;
         text-align: center;
         padding-top: 40px;
+        background-color: #E6E7E8;
+        margin: 0;
     }
     .feedback
     {
-        float: right;
-        padding-right: 10px;
+        float: none;
+        position: absolute;
+        right: 15px;
+        bottom: 10px;
         font: normal 8px/1 Verdana;
         color: #B0ADAB;
     }
@@ -644,37 +525,223 @@
         color: #00732F;
         text-decoration: underline;
     }
+    .header:after, .footer:after, .breadcrumb:after, .wrap .content:after, .group:after
+    {
+        content: ".";
+        display: block;
+        height: 0;
+        clear: both;
+        visibility: hidden;
+    }
+    #nav-topright
+    {
+        height: 70px;
+    }
+
+    #nav-topright ul
+    {
+        list-style-type: none;
+        float: right;
+        width: 370px;
+        margin-top: 11px;
+    }
+
+    #nav-topright li
+    {
+        display: inline-block;
+        margin-right: 20px;
+        float: left;
+    }
+
+    #nav-topright li.nav-topright-last
+    {
+        margin-right: 0;
+    }
+
+    #nav-topright li a
+    {
+        background: transparent url(../images/sprites-combined.png) no-repeat;
+        height: 18px;
+        display: block;
+        overflow: hidden;
+        text-indent: -9999px;
+    }
+
+    #nav-topright li.nav-topright-home a
+    {
+        width: 65px;
+        background-position: -2px -91px;
+    }
+
+    #nav-topright li.nav-topright-home a:hover
+    {
+        background-position: -2px -117px;
+    }
+
+
+    #nav-topright li.nav-topright-dev a
+    {
+        width: 30px;
+        background-position: -76px -91px;
+    }
+
+    #nav-topright li.nav-topright-dev a:hover
+    {
+        background-position: -76px -117px;
+    }
+
+
+    #nav-topright li.nav-topright-labs a
+    {
+        width: 40px;
+        background-position: -114px -91px;
+    }
+
+    #nav-topright li.nav-topright-labs a:hover
+    {
+        background-position: -114px -117px;
+    }
+
+    #nav-topright li.nav-topright-doc a
+    {
+        width: 32px;
+        background-position: -162px -91px;
+    }
+
+    #nav-topright li.nav-topright-doc a:hover, #nav-topright li.nav-topright-doc-active a
+    {
+        background-position: -162px -117px;
+    }
+
+    #nav-topright li.nav-topright-blog a
+    {
+        width: 40px;
+        background-position: -203px -91px;
+    }
+
+    #nav-topright li.nav-topright-blog a:hover, #nav-topright li.nav-topright-blog-active a
+    {
+        background-position: -203px -117px;
+    }
+
+    #nav-topright li.nav-topright-shop a
+    {
+        width: 40px;
+        background-position: -252px -91px;
+    }
+
+    #nav-topright li.nav-topright-shop a:hover, #nav-topright li.nav-topright-shop-active a
+    {
+        background-position: -252px -117px;
+    }
+
+    #nav-logo
+    {
+        background: transparent url(../images/sprites-combined.png ) no-repeat 0 -225px;
+        left: -3px;
+        position: absolute;
+        width: 75px;
+        height: 75px;
+        top: 13px;
+    }
+    #nav-logo a
+    {
+        width: 75px;
+        height: 75px;
+        display: block;
+        text-indent: -9999px;
+        overflow: hidden;
+    }
+
+
+    .shortCut-topleft-inactive
+    {
+        padding-left: 3px;
+        background: transparent url( ../images/sprites-combined.png) no-repeat 0px -58px;
+        height: 20px;
+        width: 47px;
+    }
+    .shortCut-topleft-inactive span
+    {
+        font-variant: normal;
+    }
+    #shortCut
+    {
+        padding-top: 10px;
+        font-weight: bolder;
+        color: #b0adab;
+    }
+    #shortCut ul
+    {
+        list-style-type: none;
+        float: left;
+        width: 347px;
+        margin-left: 100px;
+    }
+    #shortCut li
+    {
+        display: inline-block;
+        margin-right: 25px;
+        float: left;
+        white-space: nowrap;
+    }
+    #shortCut li a
+    {
+        color: #b0adab;
+    }
+    #shortCut li a:hover
+    {
+        color: #44a51c;
+    }
+
     hr
     {
-        background-color: #e0e0e0;
+        background-color: #E6E6E6;
+        border: 1px solid #E6E6E6;
         height: 1px;
         width: 100%;
         text-align: left;
         margin: 15px 0px 15px 0px;
     }
-    
+
     .content .alignedsummary
     {
         margin: 15px;
     }
-    /* tables */
+    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; 
+        font-size: 11px;
+        /*min-width: 395px;*/
         margin-bottom: 25px;
+        display: inline-block;
+    }
+    thead
+    {
+        margin-top: 5px;
+    }
+    th
+    {
+        padding: 3px 15px 3px 15px;
+    }
+    td
+    {
+        padding: 3px 15px 3px 20px;
     }
-    thead{margin-top: 5px;}
-    th{ padding: 3px 15px 3px 15px;}
-    td{padding: 3px 15px 3px 20px;}
     table tr.odd
     {
         border-left: 1px solid #E6E6E6;
-        background-color: #F6F6F6; 
+        background-color: #F6F6F6;
         color: #66666E;
     }
     table tr.even
@@ -685,12 +752,13 @@
     }
     table tr.odd:hover
     {
-        background-color: #E6E6E6; 
+        background-color: #E6E6E6;
     }
     table tr.even:hover
     {
         background-color: #E6E6E6;
     }
+
     span.comment
     {
         color: #8B0000;
@@ -700,15 +768,7 @@
     {
         color: #254117;
     }
-    pre
-    {
-        -moz-border-radius:7px 7px 7px 7px;
-        background-color:#F6F6F6;
-        border:1px solid #DDDDDD;
-        margin:0 20px 10px 10px;
-        padding:20px 15px 20px 20px;
-        overflow-x:auto;
-    }
+
     .qmltype
     {
         text-align: center;
@@ -719,13 +779,28 @@
         float: right;
         color: #254117;
     }
+
+    .qmldefault
+    {
+        float: right;
+        color: red;
+    }
+
+    .qmldoc
+    {
+    }
+
+    *.qmlitem p
+    {
+    }
+
     #feedbackBox
     {
-        display:none;
-        -moz-border-radius:7px 7px 7px 7px;
-        border:1px solid #DDDDDD;
-        position:fixed;
-        top:100px;
+        display: none;
+        -moz-border-radius: 7px 7px 7px 7px;
+        border: 1px solid #DDDDDD;
+        position: fixed;
+        top: 100px;
         left: 33%;
         height: 190px;
         width: 400px;
@@ -735,27 +810,27 @@
     }
     #feedcloseX a
     {
-        display:inline;
+        display: inline;
         padding: 5px 5px 0 0;
-        margin-bottom:3px;
+        margin-bottom: 3px;
         color: #363534;
-        font-weight:600;
+        font-weight: 600;
         float: right;
         text-decoration: none;
     }
+
     #feedbox
-    /* here */
     {
-        display:inline;
+        display: inline;
         width: 370px;
         height: 120px;
-        margin:0px 25px 10px 15px;
+        margin: 0px 25px 10px 15px;
     }
     #feedsubmit
     {
-        display:inline;
-        float:right;
-        margin:4px 32px 0 0;
+        display: inline;
+        float: right;
+        margin: 4px 32px 0 0;
     }
     #blurpage
     {
@@ -771,141 +846,172 @@
     }
     .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;
+        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 ul
+    .toc h3
     {
-        float: left;
-        padding: 15px;
-        
+        font: 600 12px/1.2 Arial;
+    }
+
+    .wrap .content .toc ul
+    {
+        padding-left: 0px;
+    }
+
+
+    .wrap .content .toc .level2
+    {
+        margin-left: 15px;
     }
-  
 
     .content .toc li
     {
-        font: normal 12px/1.2 Verdana;
+        font: normal 10px/1.2 Verdana;
         background: url(../images/bullet_dn.png) no-repeat 0 5px;
     }
 
-    .relpage 
+    .relpage
     {
         -moz-border-radius: 7px 7px 7px 7px;
         border: 1px solid #DDDDDD;
         padding: 25px 25px;
-        clear:both;
+        clear: both;
     }
     .relpage ul
     {
         float: none;
         padding: 15px;
     }
-    .content .relpage li 
+    .content .relpage li
     {
         font: normal 11px/1.2 Verdana;
     }
-    /* edit */
     h3.fn, span.fn
     {
         background-color: #F6F6F6;
         border-width: 1px;
         border-style: solid;
         border-color: #E6E6E6;
-        font-weight: bold; 
-        /*  padding: 6px 0px 6px 10px;*/
-         /*     margin: 42px 0px 0px 0px;*/
+        font-weight: bold;
     }
-    /* edit */
 
-    .indexbox
-    {
-        width: 100%; 
-    }
-    .content .indexboxcont li
-    {
-        font: normal 600 13px/1 Verdana;
-    }
 
- /*   .indexbox a
-    {
-        color: #00732f;
-        text-decoration: none;
-    }*/
-    .indexbox a:hover, .indexbox a:visited:hover
-    {
-        color: #4c0033;
-        text-decoration: underline;
-    }
-    .indexbox a:visited
+    /* start index box */
+    .indexbox
     {
-        color: #00732f;
-        text-decoration: none;
+        width: 100%;
+		display:inline-block;
     }
 
     .indexboxcont
     {
         display: block;
+       /* overflow: hidden;*/
     }
 
     .indexboxbar
     {
-        background: transparent url(     "../images/horBar.png" ) repeat-x left bottom;
+        background: transparent url(../images/horBar.png ) repeat-x left bottom;
         margin-bottom: 25px;
+     /*   background-image: none;
+        border-bottom: 1px solid #e2e2e2;*/
     }
 
     .indexboxcont .section
     {
-        display: inline-block; 
+        display: inline-block;
         width: 49%; 
         *width:42%;
         _width:42%;
         padding:0 2% 0 1%;
         vertical-align:top;
+
 }
 
     .indexboxcont .indexIcon
-    { 
+    {
         width: 11%; 
         *width:18%;
         _width:18%;
         overflow:hidden;
+
 }
     .indexboxcont .section p
-    { 
+    {
         padding-top: 20px;
         padding-bottom: 20px;
     }
-
     .indexboxcont .sectionlist
     {
         display: inline-block;
         width: 33%;
-        margin-right: -2px;
-        vertical-align: top;
         padding: 0;
     }
-    .tricol
-    {
-       
-    }
     .indexboxcont .sectionlist ul
     {
-        padding-left: 15px;
         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;
+    }
+
+    .indexboxcont:after
+    {
+        content: ".";
+        display: block;
+        height: 0;
+        clear: both;
+        visibility: hidden;
+    }
+
+    .indexbox .indexIcon span
+    {
+        display: block;
+    }
+    
+    .indexbox.guide .indexIcon span
+    {
+        width: 96px;
+        height: 137px;
+        background: url(../images/sprites-combined.png) no-repeat -5px -376px;
+        padding: 0;
+    }
+    
+    .indexbox.tools .indexIcon span
+    {
+        width: 115px;
+        height: 137px;
+        background: url(../images/sprites-combined.png) no-repeat -111px -376px;
+        padding: 0;
+    }
+
     .lastcol
     {
         display: inline-block;
@@ -916,12 +1022,9 @@
 
     .tricol .lastcol
     {
-        margin-left:-6px;
+        margin-left: -6px;
     }
-
-    /*.toc ul*/
-
-    /* end page elements */
+    /* end indexbox */
 }
 /* end of screen media */
 
@@ -929,7 +1032,7 @@
 
 @media print
 {
-    .header, .footer, .toolbar, .feedback, .wrapper .hd, .wrapper .bd .sidebar, .wrapper .ft
+     input, textarea, .header, .footer, .toolbar, .feedback, .wrapper .hd, .wrapper .bd .sidebar, .wrapper .ft
     {
         display: none;
         background: none;
-- 
cgit v0.12


From 33664eaa591b4325f83643d8c8a21476b1306c34 Mon Sep 17 00:00:00 2001
From: Thomas Zander 
Date: Tue, 4 May 2010 14:15:24 +0200
Subject: Disable compiling of the plugin when extra package not found

The plugin will only compile when the symbian audiorouting API
is installed which is not there by default. So check for that.
The configure check should be added soon too.
---
 src/plugins/mediaservices/mediaservices.pro | 4 +++-
 src/s60installs/s60installs.pro             | 7 ++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/plugins/mediaservices/mediaservices.pro b/src/plugins/mediaservices/mediaservices.pro
index 27f05bc..0f0b021 100644
--- a/src/plugins/mediaservices/mediaservices.pro
+++ b/src/plugins/mediaservices/mediaservices.pro
@@ -9,5 +9,7 @@ contains(QT_CONFIG, media-backend) {
         SUBDIRS += gstreamer
     }
 
-    symbian:SUBDIRS += symbian
+    symbian:contains(QT_CONFIG, audio-routing-available) {
+        SUBDIRS += symbian
+    }
 }
diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro
index dfd2694..97b2232 100644
--- a/src/s60installs/s60installs.pro
+++ b/src/s60installs/s60installs.pro
@@ -158,11 +158,12 @@ symbian: {
     contains(QT_CONFIG, media-backend) {
         qtlibraries.sources += $$QMAKE_LIBDIR_QT/QtMediaServices$${QT_LIBINFIX}.dll
 
-        mediaservices_plugins.path = c:$$QT_PLUGINS_BASE_DIR/mediaservices
-        mediaservices_plugins.sources += $$QT_BUILD_TREE/plugins/mediaservices/qmmfengine$${QT_LIBINFIX}.dll
+        contains(QT_CONFIG, audio-routing-available) {
+            mediaservices_plugins.path = c:$$QT_PLUGINS_BASE_DIR/mediaservices
+            mediaservices_plugins.sources += $$QT_BUILD_TREE/plugins/mediaservices/qmmfengine$${QT_LIBINFIX}.dll
+        }
 
         DEPLOYMENT += mediaservices_plugins
-
     }
 
     BLD_INF_RULES.prj_exports += "qt.iby $$CORE_MW_LAYER_IBY_EXPORT_PATH(qt.iby)"
-- 
cgit v0.12


From e98459fd11180c24ba9e549b96908cb33a68c714 Mon Sep 17 00:00:00 2001
From: Martin Smith 
Date: Tue, 4 May 2010 14:38:20 +0200
Subject: doc: Edited the intro.

---
 doc/src/declarative/declarativeui.qdoc | 60 ++++++++++++++++------------------
 1 file changed, 28 insertions(+), 32 deletions(-)

diff --git a/doc/src/declarative/declarativeui.qdoc b/doc/src/declarative/declarativeui.qdoc
index d79c4d2..6a1f5c5 100644
--- a/doc/src/declarative/declarativeui.qdoc
+++ b/doc/src/declarative/declarativeui.qdoc
@@ -40,46 +40,42 @@
 ****************************************************************************/
 
 /*!
-\title Declarative UI Using QML
+\title Qt Quick
 \page declarativeui.html
 
-\brief The Qt Declarative module provides a declarative framework for building
-highly dynamic, custom user interfaces.
+\brief Qt Quick provides a declarative framework for building highly
+dynamic, custom user interfaces.
 
-\section1 \l{QML Elements}{Fast QML Elements Reference Page}
+Qt Quick provides a declarative framework for building highly dynamic,
+custom user interfaces from a rich set of \l {QML Elements}{QML elements}.
+Qt Quick helps programmers and designers collaborate to
+build the fluid user interfaces that are becoming common in portable
+consumer devices, such as mobile phones, media players, set-top boxes
+and netbooks.
 
-\raw HTML
-

-\endraw
+QML is an extension to \l
+{http://www.ecma-international.org/publications/standards/Ecma-262.htm}
+{JavaScript}, that provides a mechanism to declaratively build an
+object tree of \l {QML Elements}{QML elements}.  QML improves the
+integration between JavaScript and Qt's existing QObject based type
+system, adds support for automatic \l {Property Binding}{property
+bindings} and provides \l {Network Transparency}{network transparency}
+at the language level.
 
-\section1 Preamble
+The \l {QML Elements}{QML elements} are a sophisticated set of
+graphical and behavioral building blocks.  These different elements
+are combined together in \l {QML Documents}{QML documents} to build
+components ranging in complexity from simple buttons and sliders, to
+complete internet-enabled applications like a \l
+{http://www.flickr.com}{Flickr} photo browser.
 
-Qt Declarative UI provides a declarative framework for building highly dynamic, custom
-user interfaces.  Declarative UI helps programmers and designers collaborate to build
-the animation rich, fluid user interfaces that are becoming common in portable
-consumer devices, such as mobile phones, media players, set-top boxes and netbooks.
-
-The Qt Declarative module provides an engine for interpreting the declarative
-QML language, and a rich set of \bold { \l {QML Elements}{QML elements} }
-that can be used from QML.
-
-QML is an extension to \l {http://www.ecma-international.org/publications/standards/Ecma-262.htm}
-{JavaScript}, that provides a mechanism to declaratively build an object tree
-of QML elements.  QML improves the integration between JavaScript and Qt's
-existing QObject based type system, adds support for automatic
-\l {Property Binding}{property bindings} and provides \l {Network Transparency}{network transparency} at the language
-level.
-
-The QML elements are a sophisticated set of graphical and behavioral building
-blocks.  These different elements are combined together in \l {QML Documents}{QML documents} to build components
-ranging in complexity from simple buttons and sliders, to complete
-internet-enabled applications like a \l {http://www.flickr.com}{Flickr} photo browser.
-
-Qt Declarative builds on \l {QML for Qt programmers}{Qt's existing strengths}.
-QML can be be used to incrementally extend an existing application or to build
-completely new applications.  QML is fully \l {Extending QML in C++}{extensible from C++}.
+Qt Quick builds on \l {QML for Qt programmers}{Qt's existing
+strengths}.  QML can be be used to incrementally extend an existing
+application or to build completely new applications.  QML is fully \l
+{Extending QML in C++}{extensible from C++}.
 
 \section1 Getting Started:
+
 \list
 \o \l {Introduction to the QML language}
 \o \l {QML Tutorial}{Tutorial: 'Hello World'}
-- 
cgit v0.12


From 855bbe53b69fa12a9daec49e6326a6bbe4483342 Mon Sep 17 00:00:00 2001
From: David Boddie 
Date: Tue, 4 May 2010 15:00:10 +0200
Subject: Doc: Fixed up the diagrams, aligning items with a grid.

Reviewed-by: Trust Me
---
 doc/src/diagrams/modelview-move-rows-1.sk | 62 +++++++++++++++----------------
 doc/src/diagrams/modelview-move-rows-2.sk | 46 +++++++++++------------
 doc/src/diagrams/modelview-move-rows-3.sk | 54 +++++++++++++--------------
 doc/src/diagrams/modelview-move-rows-4.sk | 40 ++++++++++----------
 4 files changed, 101 insertions(+), 101 deletions(-)

diff --git a/doc/src/diagrams/modelview-move-rows-1.sk b/doc/src/diagrams/modelview-move-rows-1.sk
index 3679dc7..dc90cfb 100644
--- a/doc/src/diagrams/modelview-move-rows-1.sk
+++ b/doc/src/diagrams/modelview-move-rows-1.sk
@@ -14,10 +14,10 @@ lw(1)
 r(30,0,0,-30,415.038,664.044)
 fp((1,1,1))
 lw(1)
-r(30,0,0,-30,219.351,425.18)
+r(30,0,0,-30,220,425)
 fp((1,1,1))
 lw(1)
-r(30,0,0,-30,414.389,337.792)
+r(30,0,0,-30,415,337.5)
 fp((1,1,1))
 lw(1)
 r(30,0,0,-30,220,605)
@@ -35,19 +35,19 @@ lw(1)
 r(30,0,0,-30,277.5,575)
 fp((0.753,0.753,1))
 lw(1)
-r(30,0,0,-30,219.351,335.18)
+r(30,0,0,-30,220,335)
 fp((0.753,0.753,1))
 lw(1)
-r(30,0,0,-30,414.389,574.044)
+r(30,0,0,-30,415,575)
 fp((1,1,1))
 lw(1)
 r(30,0,0,-30,220,545)
 fp((1,1,1))
 lw(1)
-r(30.6087,0,0,-30,218.435,305.442)
+r(30,0,0,-30.262,220,305.262)
 fp((1,1,1))
 lw(1)
-r(31.2174,0,0,-30,414.082,306.92)
+r(30,0,0,-30,415,307.5)
 fp((1,1,1))
 lw(1)
 r(30,0,0,-30,415.038,455.177)
@@ -62,31 +62,31 @@ lw(1)
 r(30,0,0,-30,220,695)
 fp((1,1,1))
 lw(1)
-r(30,0,0,-30,415.038,694.044)
+r(30,0,0,-30.956,415.038,695)
 fp((1,1,1))
 lw(1)
-r(30,0,0,-30,219.351,455.18)
+r(30,0,0,-30,220,455)
 fp((1,1,1))
 lw(1)
-r(30,0,0,-30,414.389,367.792)
+r(30,0,0,-30,415,367.5)
 fp((0.753,0.753,1))
 lw(1)
 r(30,0,0,-30,277.5,605)
 fp((0.753,0.753,1))
 lw(1)
-r(30,0,0,-30,219.351,365.18)
+r(30,0,0,-30,220,365)
 fp((0.753,0.753,1))
 lw(1)
-r(30,0,0,-30,414.389,604.044)
+r(30,0,0,-30,415,605)
 fp((0.753,0.753,1))
 lw(1)
 r(30,0,0,-30,277.5,635)
 fp((0.753,0.753,1))
 lw(1)
-r(30,0,0,-30,219.351,395.18)
+r(30,0,0,-30,220,395)
 fp((0.753,0.753,1))
 lw(1)
-r(30,0,0,-30,414.389,634.044)
+r(30,0,0,-30,415,635)
 le()
 lw(1)
 r(165,0,0,-230,210,705)
@@ -107,13 +107,13 @@ le()
 lw(1)
 Fn('Helvetica')
 Fs(20)
-txt('0',(228.791,433.32))
+txt('0',(229.44,433.14))
 fp((0,0,0))
 le()
 lw(1)
 Fn('Helvetica')
 Fs(20)
-txt('0',(423.829,345.932))
+txt('0',(424.44,345.64))
 fp((0,0,0))
 le()
 lw(1)
@@ -131,13 +131,13 @@ le()
 lw(1)
 Fn('Helvetica')
 Fs(20)
-txt('1',(228.791,403.32))
+txt('1',(229.44,403.14))
 fp((0,0,0))
 le()
 lw(1)
 Fn('Helvetica')
 Fs(20)
-txt('1',(423.829,315.932))
+txt('1',(424.44,315.64))
 fp((0,0,0))
 le()
 lw(1)
@@ -161,13 +161,13 @@ le()
 lw(1)
 Fn('Helvetica')
 Fs(20)
-txt('2',(228.791,373.32))
+txt('2',(229.44,373.14))
 fp((0,0,0))
 le()
 lw(1)
 Fn('Helvetica')
 Fs(20)
-txt('2',(423.829,612.184))
+txt('2',(424.44,613.14))
 fp((0,0,0))
 le()
 lw(1)
@@ -191,13 +191,13 @@ le()
 lw(1)
 Fn('Helvetica')
 Fs(20)
-txt('3',(228.791,343.32))
+txt('3',(229.44,343.14))
 fp((0,0,0))
 le()
 lw(1)
 Fn('Helvetica')
 Fs(20)
-txt('3',(423.829,582.184))
+txt('3',(424.44,583.14))
 fp((0,0,0))
 le()
 lw(1)
@@ -221,13 +221,13 @@ le()
 lw(1)
 Fn('Helvetica')
 Fs(20)
-txt('4',(228.791,313.32))
+txt('4',(229.44,313.14))
 fp((0,0,0))
 le()
 lw(1)
 Fn('Helvetica')
 Fs(20)
-txt('4',(423.829,552.184))
+txt('4',(424.44,553.14))
 fp((0,0,0))
 le()
 lw(1)
@@ -239,13 +239,13 @@ le()
 lw(1)
 Fn('Helvetica')
 Fs(20)
-txt('5',(228.484,283.582))
+txt('5',(229.133,283.402))
 fp((0.503,0.503,0.503))
 le()
 lw(1)
 Fn('Helvetica')
 Fs(20)
-txt('5',(423.522,285.06))
+txt('5',(424.44,285.64))
 fp((0.503,0.503,0.503))
 le()
 lw(1)
@@ -255,17 +255,17 @@ txt('5',(424.478,433.317))
 lw(1.5)
 la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
 b()
-bs(275,635,0)
-bs(255,635,0)
+bs(277.5,635,0)
+bs(252.5,635,0)
 lw(1.5)
 la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
 b()
-bs(294.508,380.772,0)
-bs(293.986,545.115,0)
+bs(292.5,380,0)
+bs(292.5,542.5,0)
 lw(1.5)
 la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
 b()
-bs(249.466,380.772,0)
-bs(291.551,380.772,0)
+bs(250,380,0)
+bs(290,380,0)
 guidelayer('Guide Lines',1,0,0,1,(0,0,1))
 grid((0,0,2.5,2.5),1,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/modelview-move-rows-2.sk b/doc/src/diagrams/modelview-move-rows-2.sk
index c453a78..7ddb95e 100644
--- a/doc/src/diagrams/modelview-move-rows-2.sk
+++ b/doc/src/diagrams/modelview-move-rows-2.sk
@@ -14,10 +14,10 @@ lw(1)
 r(30,0,0,-30,415.038,664.044)
 fp((1,1,1))
 lw(1)
-r(30,0,0,-30,219.351,425.18)
+r(30,0,0,-30,220,425)
 fp((1,1,1))
 lw(1)
-r(30,0,0,-30,414.389,337.792)
+r(30,0,0,-30,415,337.5)
 fp((1,1,1))
 lw(1)
 r(30,0,0,-30,220,605)
@@ -35,7 +35,7 @@ lw(1)
 r(30,0,0,-30,275,455)
 fp((0.753,0.753,1))
 lw(1)
-r(30,0,0,-30,219.351,335.18)
+r(30,0,0,-30,220,335)
 fp((0.753,0.753,1))
 lw(1)
 r(30,0,0,-30,415,455)
@@ -47,10 +47,10 @@ lw(1)
 r(30,0,0,-30,415,545)
 fp((1,1,1))
 lw(1)
-r(30.6087,0,0,-30,218.435,305.442)
+r(29.6927,0,0,-30,220,305.262)
 fp((1,1,1))
 lw(1)
-r(31.2174,0,0,-30,414.082,306.92)
+r(30,0,0,-30,415,307.5)
 fp((1,1,1))
 lw(1)
 r(30,0,0,-30,220,635)
@@ -65,16 +65,16 @@ lw(1)
 r(30,0,0,-30,415.038,694.044)
 fp((1,1,1))
 lw(1)
-r(30,0,0,-30,219.351,455.18)
+r(30,0,0,-30,220,455)
 fp((1,1,1))
 lw(1)
-r(30,0,0,-30,414.389,367.792)
+r(30,0,0,-30,415,367.5)
 fp((0.753,0.753,1))
 lw(1)
 r(30,0,0,-30,275,485)
 fp((0.753,0.753,1))
 lw(1)
-r(30,0,0,-30,219.351,365.18)
+r(30,0,0,-30,220,365)
 fp((0.753,0.753,1))
 lw(1)
 r(30,0,0,-30,415,485)
@@ -83,7 +83,7 @@ lw(1)
 r(30,0,0,-30,275,515)
 fp((0.753,0.753,1))
 lw(1)
-r(30,0,0,-30,219.351,395.18)
+r(30,0,0,-30,220,395)
 fp((0.753,0.753,1))
 lw(1)
 r(30,0,0,-30,415,515)
@@ -107,13 +107,13 @@ le()
 lw(1)
 Fn('Helvetica')
 Fs(20)
-txt('0',(228.791,433.32))
+txt('0',(229.44,433.14))
 fp((0,0,0))
 le()
 lw(1)
 Fn('Helvetica')
 Fs(20)
-txt('0',(423.829,345.932))
+txt('0',(424.44,345.64))
 fp((0,0,0))
 le()
 lw(1)
@@ -131,13 +131,13 @@ le()
 lw(1)
 Fn('Helvetica')
 Fs(20)
-txt('1',(228.791,403.32))
+txt('1',(229.44,403.14))
 fp((0,0,0))
 le()
 lw(1)
 Fn('Helvetica')
 Fs(20)
-txt('1',(423.829,315.932))
+txt('1',(424.44,315.64))
 fp((0,0,0))
 le()
 lw(1)
@@ -161,7 +161,7 @@ le()
 lw(1)
 Fn('Helvetica')
 Fs(20)
-txt('2',(228.791,373.32))
+txt('2',(229.44,373.14))
 fp((0,0,0))
 le()
 lw(1)
@@ -191,7 +191,7 @@ le()
 lw(1)
 Fn('Helvetica')
 Fs(20)
-txt('3',(228.791,343.32))
+txt('3',(229.44,343.14))
 fp((0,0,0))
 le()
 lw(1)
@@ -221,7 +221,7 @@ le()
 lw(1)
 Fn('Helvetica')
 Fs(20)
-txt('4',(228.791,313.32))
+txt('4',(229.44,313.14))
 fp((0,0,0))
 le()
 lw(1)
@@ -245,27 +245,27 @@ le()
 lw(1)
 Fn('Helvetica')
 Fs(20)
-txt('5',(228.484,283.582))
+txt('5',(229.133,283.402))
 fp((0.503,0.503,0.503))
 le()
 lw(1)
 Fn('Helvetica')
 Fs(20)
-txt('5',(423.522,285.06))
+txt('5',(424.44,285.64))
 lw(1.5)
 la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
 b()
-bs(272.5,515,0)
+bs(275,515,0)
 bs(252.5,515,0)
 lw(1.5)
 la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
 b()
-bs(294.508,380.772,0)
-bs(295,425,0)
+bs(292.5,380,0)
+bs(292.5,422.5,0)
 lw(1.5)
 la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
 b()
-bs(249.466,380.772,0)
-bs(291.551,380.772,0)
+bs(250,380,0)
+bs(290,380,0)
 guidelayer('Guide Lines',1,0,0,1,(0,0,1))
 grid((0,0,2.5,2.5),1,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/modelview-move-rows-3.sk b/doc/src/diagrams/modelview-move-rows-3.sk
index d320900..33a9ad1 100644
--- a/doc/src/diagrams/modelview-move-rows-3.sk
+++ b/doc/src/diagrams/modelview-move-rows-3.sk
@@ -4,30 +4,30 @@ layout('A4',0)
 layer('Layer 1',1,1,0,0,(0,0,0))
 fp((1,1,1))
 lw(1)
-r(30,0,0,-30,219.351,425.18)
+r(30,0,0,-30,220,425)
 fp((1,1,1))
 lw(1)
-r(30,0,0,-30,345.913,400)
+r(30,0,0,-30,344.997,400)
 lw(1)
-r(30,0,0,-30,219.351,335.18)
+r(30,0,0,-30,220,335)
 lw(1)
-r(30,0,0,-30,345.916,339.739)
+r(30,0,0,-30,345,339.739)
 fp((1,1,1))
 lw(1)
-r(30.6087,0,0,-30,218.435,305.442)
+r(30,0,0,-30,220,305.262)
 fp((1,1,1))
 lw(1)
-r(30.6087,0,0,-30,345,310)
+r(30,0,0,-30,345,310)
 fp((1,1,1))
 lw(1)
-r(30,0,0,-30,219.351,455.18)
+r(30,0,0,-30,220,455)
 fp((1,1,1))
 lw(1)
-r(30,0,0,-30,345.913,430)
+r(30,0,0,-30,344.997,430)
 lw(1)
-r(30,0,0,-30,219.351,365.18)
+r(30,0,0,-30,220,365)
 lw(1)
-r(30,0,0,-30,345.916,369.739)
+r(30,0,0,-30,345,369.739)
 fp((0.753,0.753,1))
 lw(1)
 r(30,0,0,-30,272.5,455)
@@ -36,7 +36,7 @@ lw(1)
 r(30,0,0,-30,345,460)
 fp((0.753,0.753,1))
 lw(1)
-r(30,0,0,-30,219.351,395.18)
+r(30,0,0,-30,220,395)
 le()
 lw(1)
 r(165,0,0,-230,210,705)
@@ -45,25 +45,25 @@ le()
 lw(1)
 Fn('Helvetica')
 Fs(20)
-txt('0',(228.791,433.32))
+txt('0',(229.44,433.14))
 fp((0.503,0.503,0.503))
 le()
 lw(1)
 Fn('Helvetica')
 Fs(20)
-txt('0',(355.353,408.14))
+txt('0',(354.437,408.14))
 fp((0,0,0))
 le()
 lw(1)
 Fn('Helvetica')
 Fs(20)
-txt('1',(228.791,403.32))
+txt('1',(229.44,403.14))
 fp((0.503,0.503,0.503))
 le()
 lw(1)
 Fn('Helvetica')
 Fs(20)
-txt('1',(355.353,378.14))
+txt('1',(354.437,378.14))
 fp((0,0,0))
 le()
 lw(1)
@@ -81,37 +81,37 @@ le()
 lw(1)
 Fn('Helvetica')
 Fs(20)
-txt('2',(228.791,373.32))
+txt('2',(229.44,373.14))
 fp((0,0,0))
 le()
 lw(1)
 Fn('Helvetica')
 Fs(20)
-txt('3',(228.791,343.32))
+txt('3',(229.44,343.14))
 fp((0,0,0))
 le()
 lw(1)
 Fn('Helvetica')
 Fs(20)
-txt('3',(355.356,347.879))
+txt('3',(354.44,347.879))
 fp((0,0,0))
 le()
 lw(1)
 Fn('Helvetica')
 Fs(20)
-txt('4',(228.791,313.32))
+txt('4',(229.44,313.14))
 fp((0,0,0))
 le()
 lw(1)
 Fn('Helvetica')
 Fs(20)
-txt('4',(355.356,317.879))
+txt('4',(354.44,317.879))
 fp((0,0,0))
 le()
 lw(1)
 Fn('Helvetica')
 Fs(20)
-txt('5',(228.484,283.582))
+txt('5',(229.133,283.402))
 fp((0,0,0))
 le()
 lw(1)
@@ -121,17 +121,17 @@ txt('5',(355.049,288.14))
 lw(1.5)
 la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
 b()
-bs(270,455,0)
-bs(250,455,0)
+bs(272.5,455,0)
+bs(252.5,455,0)
 lw(1.5)
 la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
 b()
-bs(294.508,380.772,0)
-bs(295,425,0)
+bs(287.5,380,0)
+bs(287.5,422.5,0)
 lw(1.5)
 la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
 b()
-bs(249.466,380.772,0)
-bs(291.551,380.772,0)
+bs(250,380,0)
+bs(285,380,0)
 guidelayer('Guide Lines',1,0,0,1,(0,0,1))
 grid((0,0,2.5,2.5),1,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/modelview-move-rows-4.sk b/doc/src/diagrams/modelview-move-rows-4.sk
index a8a1157..0531749 100644
--- a/doc/src/diagrams/modelview-move-rows-4.sk
+++ b/doc/src/diagrams/modelview-move-rows-4.sk
@@ -4,28 +4,28 @@ layout('A4',0)
 layer('Layer 1',1,1,0,0,(0,0,0))
 fp((1,1,1))
 lw(1)
-r(30,0,0,-30,219.351,425.18)
+r(30,0,0,-30,220,425)
 fp((1,1,1))
 lw(1)
 r(30,0,0,-30,345,430)
 lw(1)
-r(30,0,0,-30,219.351,335.18)
+r(30,0,0,-30,220,335.18)
 lw(1)
 r(30,0,0,-30,345,339.739)
 fp((1,1,1))
 lw(1)
-r(30.6087,0,0,-30,218.435,305.442)
+r(30,0,0,-30.442,220,305.442)
 fp((1,1,1))
 lw(1)
-r(30.6087,0,0,-30,344.084,310)
+r(30,0,0,-30,345,310)
 fp((1,1,1))
 lw(1)
-r(30,0,0,-30,219.351,455.18)
+r(30,0,0,-30,220,455)
 fp((1,1,1))
 lw(1)
 r(30,0,0,-30,345,460)
 lw(1)
-r(30,0,0,-30,219.351,365.18)
+r(30,0,0,-30,220,365)
 lw(1)
 r(30,0,0,-30,345,400)
 fp((0.753,0.753,1))
@@ -36,7 +36,7 @@ lw(1)
 r(30,0,0,-30,345,370)
 fp((0.753,0.753,1))
 lw(1)
-r(30,0,0,-30,219.351,395.18)
+r(30,0,0,-30,220,395)
 le()
 lw(1)
 r(165,0,0,-230,210,705)
@@ -45,7 +45,7 @@ le()
 lw(1)
 Fn('Helvetica')
 Fs(20)
-txt('0',(228.791,433.32))
+txt('0',(229.44,433.14))
 fp((0,0,0))
 le()
 lw(1)
@@ -57,7 +57,7 @@ le()
 lw(1)
 Fn('Helvetica')
 Fs(20)
-txt('1',(228.791,403.32))
+txt('1',(229.44,403.14))
 fp((0,0,0))
 le()
 lw(1)
@@ -81,13 +81,13 @@ le()
 lw(1)
 Fn('Helvetica')
 Fs(20)
-txt('2',(228.791,373.32))
+txt('2',(229.44,373.14))
 fp((0,0,0))
 le()
 lw(1)
 Fn('Helvetica')
 Fs(20)
-txt('3',(228.791,343.32))
+txt('3',(229.44,343.14))
 fp((0.503,0.503,0.503))
 le()
 lw(1)
@@ -99,7 +99,7 @@ le()
 lw(1)
 Fn('Helvetica')
 Fs(20)
-txt('4',(228.791,313.32))
+txt('4',(229.44,313.14))
 fp((0,0,0))
 le()
 lw(1)
@@ -111,27 +111,27 @@ le()
 lw(1)
 Fn('Helvetica')
 Fs(20)
-txt('5',(228.484,283.582))
+txt('5',(229.44,283.582))
 fp((0,0,0))
 le()
 lw(1)
 Fn('Helvetica')
 Fs(20)
-txt('5',(354.133,288.14))
+txt('5',(354.44,288.14))
 lw(1.5)
 la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
 b()
-bs(270,335,0)
-bs(250,335,0)
+bs(272.5,335,0)
+bs(252.5,335,0)
 lw(1.5)
 la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
 b()
-bs(294.508,380.772,0)
-bs(295,335,0)
+bs(287.5,380,0)
+bs(287.5,337.5,0)
 lw(1.5)
 la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
 b()
-bs(249.466,380.772,0)
-bs(291.551,380.772,0)
+bs(250,380,0)
+bs(285,380,0)
 guidelayer('Guide Lines',1,0,0,1,(0,0,1))
 grid((0,0,2.5,2.5),1,(0,0,1),'Grid')
-- 
cgit v0.12


From d52cc1ded5f30a6da0d11b9c3f7de66b2d3e9ee9 Mon Sep 17 00:00:00 2001
From: Jens Bache-Wiig 
Date: Tue, 4 May 2010 15:14:56 +0200
Subject: Fix rtl issues with sliders in GTK style

Sliders that draw groove decorations did not invert appearance
correctly in vertical or rtl cases. With this fix we will
flip the rectangles of the respective decorations and tell
gtk if we are using an rtl widget or not.

Task-number: QTBUG-8986
Reviewed-yb: thorbjorn
---
 src/gui/styles/qgtkstyle.cpp | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/gui/styles/qgtkstyle.cpp b/src/gui/styles/qgtkstyle.cpp
index e3ca8b2..0988fd8 100644
--- a/src/gui/styles/qgtkstyle.cpp
+++ b/src/gui/styles/qgtkstyle.cpp
@@ -1937,14 +1937,11 @@ void QGtkStyle::drawComplexControl(ComplexControl control, const QStyleOptionCom
 
             QRect groove = proxy()->subControlRect(CC_Slider, option, SC_SliderGroove, widget);
             QRect handle = proxy()->subControlRect(CC_Slider, option, SC_SliderHandle, widget);
-            QRect ticks = proxy()->subControlRect(CC_Slider, option, SC_SliderTickmarks, widget);
 
             bool horizontal = slider->orientation == Qt::Horizontal;
             bool ticksAbove = slider->tickPosition & QSlider::TicksAbove;
             bool ticksBelow = slider->tickPosition & QSlider::TicksBelow;
-            QColor activeHighlight = option->palette.color(QPalette::Normal, QPalette::Highlight);
 
-            QPixmap cache;
             QBrush oldBrush = painter->brush();
             QPen oldPen = painter->pen();
 
@@ -1953,6 +1950,8 @@ void QGtkStyle::drawComplexControl(ComplexControl control, const QStyleOptionCom
             QColor highlightAlpha(Qt::white);
             highlightAlpha.setAlpha(80);
 
+            QGtkStylePrivate::gtk_widget_set_direction(hScaleWidget, slider->upsideDown ?
+                                                       GTK_TEXT_DIR_RTL : GTK_TEXT_DIR_LTR);
             GtkWidget *scaleWidget = horizontal ? hScaleWidget : vScaleWidget;
             style = scaleWidget->style;
 
@@ -1986,11 +1985,21 @@ void QGtkStyle::drawComplexControl(ComplexControl control, const QStyleOptionCom
                     QRect lowerGroove = grooveRect;
 
                     if (horizontal) {
-                        upperGroove.setLeft(handle.center().x());
-                        lowerGroove.setRight(handle.center().x());
+                        if (slider->upsideDown) {
+                            lowerGroove.setLeft(handle.center().x());
+                            upperGroove.setRight(handle.center().x());
+                        } else {
+                            upperGroove.setLeft(handle.center().x());
+                            lowerGroove.setRight(handle.center().x());
+                        }
                     } else {
-                        upperGroove.setBottom(handle.center().y());
-                        lowerGroove.setTop(handle.center().y());
+                        if (!slider->upsideDown) {
+                            lowerGroove.setBottom(handle.center().y());
+                            upperGroove.setTop(handle.center().y());
+                        } else {
+                            upperGroove.setBottom(handle.center().y());
+                            lowerGroove.setTop(handle.center().y());
+                        }
                     }
 
                     gtkPainter.paintBox( scaleWidget, "trough-upper", upperGroove, state,
-- 
cgit v0.12


From 409ced7dc098438e185b9a6db6b3f53b1472839d Mon Sep 17 00:00:00 2001
From: Martin Smith 
Date: Tue, 4 May 2010 15:33:02 +0200
Subject: qdoc: Fixed the alphabet index in the compact list.

Now it leaves out any letter that doesn't appear in
the list. i.e. If there are no classes that begin
with QJ... J does not appear in the alphabet index.
---
 doc/src/declarative/declarativeui.qdoc |  8 ++++----
 tools/qdoc3/htmlgenerator.cpp          | 13 ++++---------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/doc/src/declarative/declarativeui.qdoc b/doc/src/declarative/declarativeui.qdoc
index 6a1f5c5..5283ba8 100644
--- a/doc/src/declarative/declarativeui.qdoc
+++ b/doc/src/declarative/declarativeui.qdoc
@@ -74,7 +74,7 @@ strengths}.  QML can be be used to incrementally extend an existing
 application or to build completely new applications.  QML is fully \l
 {Extending QML in C++}{extensible from C++}.
 
-\section1 Getting Started:
+\section1 Getting Started
 
 \list
 \o \l {Introduction to the QML language}
@@ -84,7 +84,7 @@ application or to build completely new applications.  QML is fully \l
 \o \l {QML for Qt programmers}
 \endlist
 
-\section1 Core QML Features:
+\section1 Core QML Features
 \list
 \o \l {QML Documents}
 \o \l {Property Binding}
@@ -102,7 +102,7 @@ application or to build completely new applications.  QML is fully \l
 \o \l {qmlruntime.html}{The Qt Declarative Runtime}
 \endlist
 
-\section1 Using QML with C++:
+\section1 Using QML with C++
 \list
 \o \l {Tutorial: Writing QML extensions with C++}
 \o \l {Extending QML in C++}
@@ -110,7 +110,7 @@ application or to build completely new applications.  QML is fully \l
 \o \l {Integrating QML with existing Qt UI code}
 \endlist
 
-\section1 Reference:
+\section1 Reference
 \list
 \o \l {QML Elements}
 \o \l {QML Global Object}
diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp
index 569d1cd..d32ae99 100644
--- a/tools/qdoc3/htmlgenerator.cpp
+++ b/tools/qdoc3/htmlgenerator.cpp
@@ -2399,6 +2399,7 @@ void HtmlGenerator::generateCompactList(const Node *relative,
     */
     NodeMap paragraph[NumParagraphs+1];
     QString paragraphName[NumParagraphs+1];
+    QSet usedParagraphNames;
 
     NodeMap::ConstIterator c = classMap.begin();
     while (c != classMap.end()) {
@@ -2422,6 +2423,7 @@ void HtmlGenerator::generateCompactList(const Node *relative,
         }
 
         paragraphName[paragraphNo] = key[0].toUpper();
+        usedParagraphNames.insert(key[0].toLower().cell());
         paragraph[paragraphNo].insert(key, c.value());
         ++c;
     }
@@ -2469,12 +2471,12 @@ void HtmlGenerator::generateCompactList(const Node *relative,
         out() << "
";
         for (int i = 0; i < 26; i++) {
             QChar ch('a' + i);
-            out() << QString("%2 ").arg(ch).arg(ch.toUpper());
+            if (usedParagraphNames.contains(char('a' + i)))
+                out() << QString("%2 ").arg(ch).arg(ch.toUpper());
         }
         out() << "
\n";
     }
 
-    QSet used;
     out() << "\n";
     for (k = 0; k < numRows; k++) {
         out() << "\n";
@@ -2502,7 +2504,6 @@ void HtmlGenerator::generateCompactList(const Node *relative,
                     if (includeAlphabet) {
                         QChar c = paragraphName[currentParagraphNo[i]][0].toLower();
                         out() << QString("").arg(c);
-                        used.insert(c.cell());
                     }
                     out() << ""
                           << paragraphName[currentParagraphNo[i]]
@@ -2545,12 +2546,6 @@ void HtmlGenerator::generateCompactList(const Node *relative,
         out() << "\n";
     }
     out() << "\n";
-    char C = 'a';
-    while (C <= 'z') {
-        if (!used.contains(C))
-            out() << QString("").arg(C);
-        ++C;
-    }
 }
 
 void HtmlGenerator::generateFunctionIndex(const Node *relative,
-- 
cgit v0.12


From 8737df24cd58359dacd3d0cb7f856cb7484f03c8 Mon Sep 17 00:00:00 2001
From: Morten Engvoldsen 
Date: Tue, 4 May 2010 15:53:33 +0200
Subject: Doc: Updating style and HTML in CSS and qdoc Adding all classnames
 generated in qdoc to the CSS and removing redundant   from
 htmlgenerator.

Reviewed-by: Trust Me
---
 doc/src/template/style/style.css | 96 +++++++++++++++++++++++++++++++++++-----
 tools/qdoc3/htmlgenerator.cpp    | 12 ++---
 2 files changed, 91 insertions(+), 17 deletions(-)

diff --git a/doc/src/template/style/style.css b/doc/src/template/style/style.css
index 9c290f5..2da91f3 100755
--- a/doc/src/template/style/style.css
+++ b/doc/src/template/style/style.css
@@ -58,6 +58,10 @@
     {
         vertical-align: baseline;
     }
+	tt, .qmlreadonly span, .qmldefault span
+	{
+		word-spacing:5px;
+	}
     .heading
     {
         font: normal 600 16px/1.0 Arial;
@@ -483,7 +487,7 @@
     .wrap .content p
     {
         line-height: 20px;
-        padding: 10px 5px 10px 5px;
+        padding: 5px 5px 5px 5px;
     }
     .wrap .content ul
     {
@@ -499,7 +503,11 @@
         color: #4c0033;
         text-decoration: none;
     }
-    .footer
+     .content a:visited:hover
+    {
+        color: #4c0033;
+        text-decoration: underline;
+    }   .footer
     {
         min-height: 100px;
         color: #797775;
@@ -665,6 +673,10 @@
     {
         font-variant: normal;
     }
+	    .shortCut-topleft-inactive span a:hover,     .shortCut-topleft-active a:hover
+	{
+		text-decoration:none;
+	}
     #shortCut
     {
         padding-top: 10px;
@@ -732,12 +744,16 @@
     }
     th
     {
-        padding: 3px 15px 3px 15px;
+        padding: 5px 15px 5px 15px;
     }
     td
     {
         padding: 3px 15px 3px 20px;
     }
+	td.rightAlign
+	{
+        padding: 3px 15px 3px 10px;
+	}
     table tr.odd
     {
         border-left: 1px solid #E6E6E6;
@@ -758,7 +774,7 @@
     {
         background-color: #E6E6E6;
     }
-
+		
     span.comment
     {
         color: #8B0000;
@@ -856,11 +872,35 @@
         width: 200px;
     }
 
-    .toc h3
+    .toc h3, .generic a
     {
         font: 600 12px/1.2 Arial;
     }
 
+	.generic{}
+	.alignedsummary{}
+	.propsummary{}
+	.memItemLeft{}
+	.memItemRight{}
+	.bottomAlign{}
+	.highlightedCode{}
+	.LegaleseLeft{}
+	.valuelist{}
+	.annotated{}
+	.obsolete{}
+	.compat{}
+	.flags{}
+	.qmlsummary{}
+	.qmlitem{}
+	.qmlproto{}
+	.qmlname{}
+	.qmlreadonly{}
+	.qmldefault{}
+	.qmldoc{}
+	.qt-style{}
+	.redFont{}
+	code{}
+	
     .wrap .content .toc ul
     {
         padding-left: 0px;
@@ -901,8 +941,42 @@
         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;
+	}
+	
+	.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
@@ -929,8 +1003,8 @@
     {
         display: inline-block;
         width: 49%; 
-        *width:42%;
-        _width:42%;
+       /* *width:42%;
+        _width:42%;*/
         padding:0 2% 0 1%;
         vertical-align:top;
 
@@ -939,8 +1013,8 @@
     .indexboxcont .indexIcon
     {
         width: 11%; 
-        *width:18%;
-        _width:18%;
+       /* *width:18%;
+        _width:18%;*/
         overflow:hidden;
 
 }
diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp
index d32ae99..801e199 100644
--- a/tools/qdoc3/htmlgenerator.cpp
+++ b/tools/qdoc3/htmlgenerator.cpp
@@ -2507,7 +2507,7 @@ void HtmlGenerator::generateCompactList(const Node *relative,
                     }
                     out() << ""
                           << paragraphName[currentParagraphNo[i]]
-                          << " ";
+                          << "";
                 }
                 out() << "\n";
 
@@ -2677,7 +2677,7 @@ void HtmlGenerator::generateQmlItem(const Node *node,
     if (summary)
         marked.replace("@name>", "b>");
 
-    marked.replace("<@extra>", "  ");
+    marked.replace("<@extra>", "");
     marked.replace("", "");
 
     if (summary) {
@@ -2986,7 +2986,7 @@ void HtmlGenerator::generateSynopsis(const Node *node,
         extraRegExp.setMinimal(true);
         marked.replace(extraRegExp, "");
     } else {
-        marked.replace("<@extra>", "  ");
+        marked.replace("<@extra>", "");
         marked.replace("", "");
     }
 
@@ -3265,7 +3265,7 @@ void HtmlGenerator::generateSynopsis(const Node *node,
         extraRegExp.setMinimal(true);
         marked.replace(extraRegExp, "");
     } else {
-        marked.replace("<@extra>", "  ");
+        marked.replace("<@extra>", "");
         marked.replace("", "");
     }
 
@@ -4436,9 +4436,9 @@ void HtmlGenerator::generateDetailedQmlMember(const Node *node,
                 out() << "";
                 out() << "";
                 if (!qpn->isWritable())
-                    out() << "read-only ";
+                    out() << "read-only";
                 if (qpgn->isDefault())
-                    out() << "default ";
+                    out() << "default";
                 generateQmlItem(qpn, relative, marker, false);
                 out() << "";
                 if (qpgn->isDefault()) {
-- 
cgit v0.12


From 62201af6fd7a704e936692231b35342ce051bb08 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint 
Date: Wed, 12 May 2010 10:49:07 +0200
Subject: REG 4.7: Edit widgets icon no longer in toolbar.

Task-number: QTBUG-10626
Reviewed-by: Daniel Molkentin 
---
 tools/designer/src/designer/qdesigner_actions.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/designer/src/designer/qdesigner_actions.cpp b/tools/designer/src/designer/qdesigner_actions.cpp
index a593a76..86b6214 100644
--- a/tools/designer/src/designer/qdesigner_actions.cpp
+++ b/tools/designer/src/designer/qdesigner_actions.cpp
@@ -347,6 +347,7 @@ QDesignerActions::QDesignerActions(QDesignerWorkbench *workbench)
     connect(m_editWidgetsAction, SIGNAL(triggered()), this, SLOT(editWidgetsSlot()));
     m_editWidgetsAction->setChecked(true);
     m_editWidgetsAction->setEnabled(false);
+    m_editWidgetsAction->setProperty(QDesignerActions::defaultToolbarPropertyName, true);
     m_toolActions->addAction(m_editWidgetsAction);
 
     connect(formWindowManager, SIGNAL(activeFormWindowChanged(QDesignerFormWindowInterface*)),
-- 
cgit v0.12


From 0ebc9783d8ca0c4b27208bbc002c53c52c19ab4c Mon Sep 17 00:00:00 2001
From: "Bradley T. Hughes" 
Date: Tue, 4 May 2010 16:25:18 +0200
Subject: Use qrand() instead of rand()

This only affects X11 code, and are the only 2 places in Qt where rand() is
used instead of qrand().

Task-number: QTBUG-9793
Reviewed-by: TrustMe
---
 src/gui/kernel/qwidget_x11.cpp        | 2 +-
 src/gui/painting/qpaintengine_x11.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gui/kernel/qwidget_x11.cpp b/src/gui/kernel/qwidget_x11.cpp
index 37ac6bf..43f510c 100644
--- a/src/gui/kernel/qwidget_x11.cpp
+++ b/src/gui/kernel/qwidget_x11.cpp
@@ -3000,7 +3000,7 @@ Picture QX11Data::getSolidFill(int screen, const QColor &c)
             return X11->solid_fills[i].picture;
     }
     // none found, replace one
-    int i = rand() % 16;
+    int i = qrand() % 16;
 
     if (X11->solid_fills[i].screen != screen && X11->solid_fills[i].picture) {
         XRenderFreePicture (X11->display, X11->solid_fills[i].picture);
diff --git a/src/gui/painting/qpaintengine_x11.cpp b/src/gui/painting/qpaintengine_x11.cpp
index da48fcb..aef8b80 100644
--- a/src/gui/painting/qpaintengine_x11.cpp
+++ b/src/gui/painting/qpaintengine_x11.cpp
@@ -315,7 +315,7 @@ static Picture getPatternFill(int screen, const QBrush &b)
             return X11->pattern_fills[i].picture;
     }
     // none found, replace one
-    int i = rand() % 16;
+    int i = qrand() % 16;
 
     if (X11->pattern_fills[i].screen != screen && X11->pattern_fills[i].picture) {
 	XRenderFreePicture (X11->display, X11->pattern_fills[i].picture);
-- 
cgit v0.12


From d59ef5d00b6c07c3a1c332ebdd0fac060538940c Mon Sep 17 00:00:00 2001
From: Thiago Macieira 
Date: Tue, 4 May 2010 18:48:36 +0200
Subject: QtDeclarative: remove spurious semi-colons from the source code

---
 src/declarative/graphicsitems/qdeclarativegridview_p.h    | 2 +-
 src/declarative/graphicsitems/qdeclarativelistview_p.h    | 2 +-
 src/declarative/qml/qdeclarativebinding_p.h               | 2 +-
 src/declarative/qml/qdeclarativecompiledbindings_p.h      | 4 ++--
 src/declarative/qml/qdeclarativecomponent_p.h             | 2 +-
 src/declarative/qml/qdeclarativecontext.h                 | 2 +-
 src/declarative/qml/qdeclarativeguard_p.h                 | 2 +-
 src/declarative/qml/qdeclarativepropertycache.cpp         | 2 +-
 src/declarative/qml/qdeclarativescriptstring.h            | 2 +-
 src/declarative/qml/qdeclarativestringconverters_p.h      | 2 +-
 src/declarative/qml/qdeclarativeworkerscript_p.h          | 2 +-
 src/declarative/qml/qdeclarativexmlhttprequest.cpp        | 6 +++---
 src/declarative/util/qdeclarativelistmodelworkeragent_p.h | 2 +-
 src/declarative/util/qdeclarativesmoothedanimation_p.h    | 2 +-
 src/declarative/util/qdeclarativesmoothedfollow_p.h       | 2 +-
 src/declarative/util/qdeclarativetransitionmanager_p_p.h  | 2 +-
 16 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/declarative/graphicsitems/qdeclarativegridview_p.h b/src/declarative/graphicsitems/qdeclarativegridview_p.h
index c06879e..f5d061d 100644
--- a/src/declarative/graphicsitems/qdeclarativegridview_p.h
+++ b/src/declarative/graphicsitems/qdeclarativegridview_p.h
@@ -142,7 +142,7 @@ public:
     void setSnapMode(SnapMode mode);
 
     enum PositionMode { Beginning, Center, End, Visible, Contain };
-    Q_ENUMS(PositionMode);
+    Q_ENUMS(PositionMode)
 
     Q_INVOKABLE void positionViewAtIndex(int index, int mode);
     Q_INVOKABLE int indexAt(int x, int y) const;
diff --git a/src/declarative/graphicsitems/qdeclarativelistview_p.h b/src/declarative/graphicsitems/qdeclarativelistview_p.h
index 9c0b7dd..051455c 100644
--- a/src/declarative/graphicsitems/qdeclarativelistview_p.h
+++ b/src/declarative/graphicsitems/qdeclarativelistview_p.h
@@ -200,7 +200,7 @@ public:
     static QDeclarativeListViewAttached *qmlAttachedProperties(QObject *);
 
     enum PositionMode { Beginning, Center, End, Visible, Contain };
-    Q_ENUMS(PositionMode);
+    Q_ENUMS(PositionMode)
 
     Q_INVOKABLE void positionViewAtIndex(int index, int mode);
     Q_INVOKABLE int indexAt(int x, int y) const;
diff --git a/src/declarative/qml/qdeclarativebinding_p.h b/src/declarative/qml/qdeclarativebinding_p.h
index 2d3acf5..598f09f 100644
--- a/src/declarative/qml/qdeclarativebinding_p.h
+++ b/src/declarative/qml/qdeclarativebinding_p.h
@@ -164,6 +164,6 @@ private:
 
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(QDeclarativeBinding*);
+Q_DECLARE_METATYPE(QDeclarativeBinding*)
 
 #endif // QDECLARATIVEBINDING_P_H
diff --git a/src/declarative/qml/qdeclarativecompiledbindings_p.h b/src/declarative/qml/qdeclarativecompiledbindings_p.h
index a17bc84..d5c6a02 100644
--- a/src/declarative/qml/qdeclarativecompiledbindings_p.h
+++ b/src/declarative/qml/qdeclarativecompiledbindings_p.h
@@ -104,8 +104,8 @@ protected:
     int qt_metacall(QMetaObject::Call, int, void **);
 
 private:
-    Q_DISABLE_COPY(QDeclarativeCompiledBindings);
-    Q_DECLARE_PRIVATE(QDeclarativeCompiledBindings);
+    Q_DISABLE_COPY(QDeclarativeCompiledBindings)
+    Q_DECLARE_PRIVATE(QDeclarativeCompiledBindings)
 };
 
 QT_END_NAMESPACE
diff --git a/src/declarative/qml/qdeclarativecomponent_p.h b/src/declarative/qml/qdeclarativecomponent_p.h
index 24e5386..8b95945 100644
--- a/src/declarative/qml/qdeclarativecomponent_p.h
+++ b/src/declarative/qml/qdeclarativecomponent_p.h
@@ -149,7 +149,7 @@ Q_SIGNALS:
     void destruction();
 
 private:
-    friend class QDeclarativeContextData;;
+    friend class QDeclarativeContextData;
     friend class QDeclarativeComponentPrivate;
 };
 
diff --git a/src/declarative/qml/qdeclarativecontext.h b/src/declarative/qml/qdeclarativecontext.h
index 548869c..d87123a 100644
--- a/src/declarative/qml/qdeclarativecontext.h
+++ b/src/declarative/qml/qdeclarativecontext.h
@@ -107,7 +107,7 @@ private:
 };
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(QList);
+Q_DECLARE_METATYPE(QList)
 
 QT_END_HEADER
 
diff --git a/src/declarative/qml/qdeclarativeguard_p.h b/src/declarative/qml/qdeclarativeguard_p.h
index be60ce4..02fed0b 100644
--- a/src/declarative/qml/qdeclarativeguard_p.h
+++ b/src/declarative/qml/qdeclarativeguard_p.h
@@ -97,7 +97,7 @@ private:
 
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(QDeclarativeGuard);
+Q_DECLARE_METATYPE(QDeclarativeGuard)
 
 #include "private/qdeclarativedata_p.h"
 
diff --git a/src/declarative/qml/qdeclarativepropertycache.cpp b/src/declarative/qml/qdeclarativepropertycache.cpp
index 888945b..26bddde 100644
--- a/src/declarative/qml/qdeclarativepropertycache.cpp
+++ b/src/declarative/qml/qdeclarativepropertycache.cpp
@@ -45,7 +45,7 @@
 #include "private/qdeclarativebinding_p.h"
 #include 
 
-Q_DECLARE_METATYPE(QScriptValue);
+Q_DECLARE_METATYPE(QScriptValue)
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qdeclarativescriptstring.h b/src/declarative/qml/qdeclarativescriptstring.h
index 43bef44..fc92a9b 100644
--- a/src/declarative/qml/qdeclarativescriptstring.h
+++ b/src/declarative/qml/qdeclarativescriptstring.h
@@ -79,7 +79,7 @@ private:
 
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(QDeclarativeScriptString);
+Q_DECLARE_METATYPE(QDeclarativeScriptString)
 
 QT_END_HEADER
 
diff --git a/src/declarative/qml/qdeclarativestringconverters_p.h b/src/declarative/qml/qdeclarativestringconverters_p.h
index 7afdfd3..97f72fc 100644
--- a/src/declarative/qml/qdeclarativestringconverters_p.h
+++ b/src/declarative/qml/qdeclarativestringconverters_p.h
@@ -80,7 +80,7 @@ namespace QDeclarativeStringConverters
     QSizeF Q_DECLARATIVE_EXPORT sizeFFromString(const QString &, bool *ok = 0);
     QRectF Q_DECLARATIVE_EXPORT rectFFromString(const QString &, bool *ok = 0);
     QVector3D Q_DECLARATIVE_EXPORT vector3DFromString(const QString &, bool *ok = 0);
-};
+}
 
 QT_END_NAMESPACE
 
diff --git a/src/declarative/qml/qdeclarativeworkerscript_p.h b/src/declarative/qml/qdeclarativeworkerscript_p.h
index 6cce799..4019d13 100644
--- a/src/declarative/qml/qdeclarativeworkerscript_p.h
+++ b/src/declarative/qml/qdeclarativeworkerscript_p.h
@@ -119,7 +119,7 @@ private:
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QDeclarativeWorkerScript);
+QML_DECLARE_TYPE(QDeclarativeWorkerScript)
 
 QT_END_HEADER
 
diff --git a/src/declarative/qml/qdeclarativexmlhttprequest.cpp b/src/declarative/qml/qdeclarativexmlhttprequest.cpp
index b7e1832..e034165 100644
--- a/src/declarative/qml/qdeclarativexmlhttprequest.cpp
+++ b/src/declarative/qml/qdeclarativexmlhttprequest.cpp
@@ -318,9 +318,9 @@ public:
 
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(Node);
-Q_DECLARE_METATYPE(NodeList);
-Q_DECLARE_METATYPE(NamedNodeMap);
+Q_DECLARE_METATYPE(Node)
+Q_DECLARE_METATYPE(NodeList)
+Q_DECLARE_METATYPE(NamedNodeMap)
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/util/qdeclarativelistmodelworkeragent_p.h b/src/declarative/util/qdeclarativelistmodelworkeragent_p.h
index 53d30c2..1622144 100644
--- a/src/declarative/util/qdeclarativelistmodelworkeragent_p.h
+++ b/src/declarative/util/qdeclarativelistmodelworkeragent_p.h
@@ -146,7 +146,7 @@ private:
 
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(QDeclarativeListModelWorkerAgent::VariantRef);
+Q_DECLARE_METATYPE(QDeclarativeListModelWorkerAgent::VariantRef)
 
 QT_END_HEADER
 
diff --git a/src/declarative/util/qdeclarativesmoothedanimation_p.h b/src/declarative/util/qdeclarativesmoothedanimation_p.h
index 17aafa4..f45d19f 100644
--- a/src/declarative/util/qdeclarativesmoothedanimation_p.h
+++ b/src/declarative/util/qdeclarativesmoothedanimation_p.h
@@ -96,7 +96,7 @@ Q_SIGNALS:
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QDeclarativeSmoothedAnimation);
+QML_DECLARE_TYPE(QDeclarativeSmoothedAnimation)
 
 QT_END_HEADER
 
diff --git a/src/declarative/util/qdeclarativesmoothedfollow_p.h b/src/declarative/util/qdeclarativesmoothedfollow_p.h
index d860052..6319192 100644
--- a/src/declarative/util/qdeclarativesmoothedfollow_p.h
+++ b/src/declarative/util/qdeclarativesmoothedfollow_p.h
@@ -106,7 +106,7 @@ Q_SIGNALS:
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QDeclarativeSmoothedFollow);
+QML_DECLARE_TYPE(QDeclarativeSmoothedFollow)
 
 QT_END_HEADER
 
diff --git a/src/declarative/util/qdeclarativetransitionmanager_p_p.h b/src/declarative/util/qdeclarativetransitionmanager_p_p.h
index 4131391..2e23898 100644
--- a/src/declarative/util/qdeclarativetransitionmanager_p_p.h
+++ b/src/declarative/util/qdeclarativetransitionmanager_p_p.h
@@ -70,7 +70,7 @@ public:
     void cancel();
 
 private:
-    Q_DISABLE_COPY(QDeclarativeTransitionManager);
+    Q_DISABLE_COPY(QDeclarativeTransitionManager)
     QDeclarativeTransitionManagerPrivate *d;
 
     void complete();
-- 
cgit v0.12


From 395e00552802024cb41335bc87675441ff119d3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Abecasis?= 
Date: Tue, 4 May 2010 18:43:42 +0200
Subject: Skip tst_LargeFile::mapOffsetOverflow on Mac

On this platform mmap'ing beyond EOF may succeed, even beyond filesystem
capabilities, but generate Bus Errors on access.

Skipping this failing test and accepting the underlying undefined
behavior is the right thing to do, until QFile offers proper guarantees.

Reviewed-by: Thiago Macieira
---
 tests/auto/qfile/largefile/tst_largefile.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/auto/qfile/largefile/tst_largefile.cpp b/tests/auto/qfile/largefile/tst_largefile.cpp
index 041e5f2..60c5f89 100644
--- a/tests/auto/qfile/largefile/tst_largefile.cpp
+++ b/tests/auto/qfile/largefile/tst_largefile.cpp
@@ -523,6 +523,10 @@ void tst_LargeFile::mapFile()
 
 void tst_LargeFile::mapOffsetOverflow()
 {
+#if defined(Q_OS_MAC)
+    QSKIP("mmap'ping beyond EOF may succeed; generate bus error on access", SkipAll);
+#endif
+
     // Out-of-range mappings should fail, and not silently clip the offset
     for (int i = 50; i < 63; ++i) {
         uchar *address = 0;
-- 
cgit v0.12


From 36e6c652bc087a6adcef1fad9f899b787e67e9af Mon Sep 17 00:00:00 2001
From: Aaron McCarthy 
Date: Wed, 5 May 2010 10:06:52 +1000
Subject: Update changelog.

---
 dist/changes-4.7.0 | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/dist/changes-4.7.0 b/dist/changes-4.7.0
index 4fd7fdb..d156bd7 100644
--- a/dist/changes-4.7.0
+++ b/dist/changes-4.7.0
@@ -27,6 +27,13 @@ General Improvements
 - Support for the GL_EXT_geometry_shader4, aka Geometry Shaders, was added
   to QGLShaderProgram.
 
+New features
+------------
+
+ - QNetworkSession, QNetworkConfiguration, QNetworkConfigurationManager
+    * New bearer management classes added.
+
+
 Third party components
 ----------------------
 
-- 
cgit v0.12


From 3b3ec6bc4114db82462eef812a47db420d4505c2 Mon Sep 17 00:00:00 2001
From: Rhys Weatherley 
Date: Wed, 5 May 2010 10:19:40 +1000
Subject: Fix a crash with null objects returned from a Q_INVOKABLE

Task-number: QTBUG-10412
Reviewed-by: Aaron Kennedy
---
 src/declarative/qml/qdeclarativeobjectscriptclass.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/declarative/qml/qdeclarativeobjectscriptclass.cpp b/src/declarative/qml/qdeclarativeobjectscriptclass.cpp
index 03366f0..170f440 100644
--- a/src/declarative/qml/qdeclarativeobjectscriptclass.cpp
+++ b/src/declarative/qml/qdeclarativeobjectscriptclass.cpp
@@ -775,7 +775,8 @@ QScriptDeclarativeClass::Value MetaCallArgument::toValue(QDeclarativeEngine *e)
         return QScriptDeclarativeClass::Value(engine, *((QString *)&data));
     } else if (type == QMetaType::QObjectStar) {
         QObject *object = *((QObject **)&data);
-        QDeclarativeData::get(object, true)->setImplicitDestructible();
+        if (object)
+            QDeclarativeData::get(object, true)->setImplicitDestructible();
         QDeclarativeEnginePrivate *priv = QDeclarativeEnginePrivate::get(e);
         return QScriptDeclarativeClass::Value(engine, priv->objectClass->newQObject(object));
     } else if (type == qMetaTypeId >()) {
-- 
cgit v0.12


From 4982b883c31874206aaa05268852fbcee81a8a39 Mon Sep 17 00:00:00 2001
From: Michael Brasser 
Date: Wed, 5 May 2010 11:49:20 +1000
Subject: Enable states to be activated via their 'when' clause even if
 unnamed.

Autogenerate a name for unnamed states: "anonymousState1", etc.

Task-number: QTBUG-10352
Reviewed-by: Aaron Kennedy
---
 src/declarative/util/qdeclarativestategroup.cpp      | 10 +++++++++-
 .../qdeclarativestates/data/unnamedWhen.qml          | 14 ++++++++++++++
 .../qdeclarativestates/tst_qdeclarativestates.cpp    | 20 ++++++++++++++++++++
 3 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 tests/auto/declarative/qdeclarativestates/data/unnamedWhen.qml

diff --git a/src/declarative/util/qdeclarativestategroup.cpp b/src/declarative/util/qdeclarativestategroup.cpp
index 5b51495..9b042d7 100644
--- a/src/declarative/util/qdeclarativestategroup.cpp
+++ b/src/declarative/util/qdeclarativestategroup.cpp
@@ -47,6 +47,7 @@
 #include 
 #include 
 
+#include 
 #include 
 
 #include 
@@ -62,7 +63,7 @@ class QDeclarativeStateGroupPrivate : public QObjectPrivate
 public:
     QDeclarativeStateGroupPrivate()
     : nullState(0), componentComplete(true),
-      ignoreTrans(false), applyingState(false) {}
+      ignoreTrans(false), applyingState(false), unnamedCount(0) {}
 
     QString currentState;
     QDeclarativeState *nullState;
@@ -78,6 +79,7 @@ public:
     bool componentComplete;
     bool ignoreTrans;
     bool applyingState;
+    int unnamedCount;
 
     QDeclarativeTransition *findTransition(const QString &from, const QString &to);
     void setCurrentStateInternal(const QString &state, bool = false);
@@ -259,6 +261,12 @@ void QDeclarativeStateGroup::componentComplete()
     Q_D(QDeclarativeStateGroup);
     d->componentComplete = true;
 
+    for (int ii = 0; ii < d->states.count(); ++ii) {
+        QDeclarativeState *state = d->states.at(ii);
+        if (state->name().isEmpty())
+            state->setName(QLatin1String("anonymousState") % QString::number(++d->unnamedCount));
+    }
+
     if (d->updateAutoState()) {
         return;
     } else if (!d->currentState.isEmpty()) {
diff --git a/tests/auto/declarative/qdeclarativestates/data/unnamedWhen.qml b/tests/auto/declarative/qdeclarativestates/data/unnamedWhen.qml
new file mode 100644
index 0000000..a70840c
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/data/unnamedWhen.qml
@@ -0,0 +1,14 @@
+import Qt 4.7
+
+Rectangle {
+    id: theRect
+    property bool triggerState: false
+    property string stateString: ""
+    states: State {
+        when: triggerState
+        PropertyChanges {
+            target: theRect
+            stateString: "inState"
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp b/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp
index d384d26..13992ad 100644
--- a/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp
+++ b/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp
@@ -110,6 +110,7 @@ private slots:
     void illegalObjectCreation();
     void whenOrdering();
     void urlResolution();
+    void unnamedWhen();
 };
 
 void tst_qdeclarativestates::initTestCase()
@@ -1049,6 +1050,25 @@ void tst_qdeclarativestates::urlResolution()
     QCOMPARE(image3->source(), resolved);
 }
 
+void tst_qdeclarativestates::unnamedWhen()
+{
+    QDeclarativeEngine engine;
+
+    QDeclarativeComponent c(&engine, SRCDIR "/data/unnamedWhen.qml");
+    QDeclarativeRectangle *rect = qobject_cast(c.create());
+    QVERIFY(rect != 0);
+    QDeclarativeItemPrivate *rectPrivate = QDeclarativeItemPrivate::get(rect);
+
+    QCOMPARE(rectPrivate->state(), QLatin1String(""));
+    QCOMPARE(rect->property("stateString").toString(), QLatin1String(""));
+    rect->setProperty("triggerState", true);
+    QCOMPARE(rectPrivate->state(), QLatin1String("anonymousState1"));
+    QCOMPARE(rect->property("stateString").toString(), QLatin1String("inState"));
+    rect->setProperty("triggerState", false);
+    QCOMPARE(rectPrivate->state(), QLatin1String(""));
+    QCOMPARE(rect->property("stateString").toString(), QLatin1String(""));
+}
+
 QTEST_MAIN(tst_qdeclarativestates)
 
 #include "tst_qdeclarativestates.moc"
-- 
cgit v0.12


From a5d15c36ae3db3caff4eeb86fd7eb5cdbb928f2d Mon Sep 17 00:00:00 2001
From: Warwick Allison 
Date: Wed, 5 May 2010 12:16:28 +1000
Subject: syntax update

---
 src/imports/gestures/qdeclarativegesturearea.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/imports/gestures/qdeclarativegesturearea.cpp b/src/imports/gestures/qdeclarativegesturearea.cpp
index 615c674..19afe0c 100644
--- a/src/imports/gestures/qdeclarativegesturearea.cpp
+++ b/src/imports/gestures/qdeclarativegesturearea.cpp
@@ -259,7 +259,7 @@ bool QDeclarativeGestureAreaPrivate::gestureEvent(QGestureEvent *event)
     bool accept = true;
     for (Bindings::Iterator it = bindings.begin(); it != bindings.end(); ++it) {
         if ((gesture = event->gesture(it.key()))) {
-            it.value()->value();
+            it.value()->evaluate();
             event->setAccepted(true); // XXX only if value returns true?
         }
     }
-- 
cgit v0.12


From 326dab74ba8df7707d1054ca5e0280c5f131c148 Mon Sep 17 00:00:00 2001
From: Aaron Kennedy 
Date: Wed, 5 May 2010 12:51:02 +1000
Subject: Null objects should appear as JS null

---
 src/declarative/qml/qdeclarativeobjectscriptclass.cpp                 | 3 ++-
 tests/auto/declarative/qdeclarativeecmascript/data/deletedObject.qml  | 4 ++--
 .../declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/declarative/qml/qdeclarativeobjectscriptclass.cpp b/src/declarative/qml/qdeclarativeobjectscriptclass.cpp
index 170f440..8b64e0e 100644
--- a/src/declarative/qml/qdeclarativeobjectscriptclass.cpp
+++ b/src/declarative/qml/qdeclarativeobjectscriptclass.cpp
@@ -104,7 +104,8 @@ QScriptValue QDeclarativeObjectScriptClass::newQObject(QObject *object, int type
     QScriptEngine *scriptEngine = QDeclarativeEnginePrivate::getScriptEngine(engine);
 
     if (!object)
-        return newObject(scriptEngine, this, new ObjectData(object, type));
+        return scriptEngine->nullValue();
+//        return newObject(scriptEngine, this, new ObjectData(object, type));
 
     if (QObjectPrivate::get(object)->wasDeleted)
        return scriptEngine->undefinedValue();
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/deletedObject.qml b/tests/auto/declarative/qdeclarativeecmascript/data/deletedObject.qml
index 72b59ae..2337e44 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/deletedObject.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/deletedObject.qml
@@ -19,7 +19,7 @@ QtObject {
 
         myObject.deleteOnSet = 1;
 
-        test3 = myObject.value == undefined;
-        test4 = obj.value == undefined;
+        test3 = myObject == null
+        test4 = obj == null
     }
 }
diff --git a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
index 6d39be2..8c9290f 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
+++ b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
@@ -1104,7 +1104,7 @@ void tst_qdeclarativeecmascript::exceptionClearsOnReeval()
     QDeclarativeComponent component(&engine, TEST_FILE("exceptionClearsOnReeval.qml"));
     QString url = component.url().toString();
 
-    QString warning = url + ":4: TypeError: Result of expression 'objectProperty.objectProperty' [undefined] is not an object.";
+    QString warning = url + ":4: TypeError: Result of expression 'objectProperty' [null] is not an object.";
 
     QTest::ignoreMessage(QtWarningMsg, warning.toLatin1().constData());
     MyQmlObject *object = qobject_cast(component.create());
-- 
cgit v0.12


From dcee637a9f7a024803f0e5cc1bf57d878dca2ac3 Mon Sep 17 00:00:00 2001
From: Bea Lam 
Date: Wed, 5 May 2010 09:50:53 +1000
Subject: Doc improvements, simplify example code

---
 doc/src/declarative/advtutorial.qdoc               | 50 +++++++++++++++----
 doc/src/declarative/tutorial.qdoc                  | 15 +++---
 .../declarative/tutorials/helloworld/tutorial1.qml |  3 +-
 .../declarative/tutorials/helloworld/tutorial2.qml |  3 +-
 .../declarative/tutorials/helloworld/tutorial3.qml |  3 +-
 .../tutorials/samegame/samegame1/Block.qml         |  2 +-
 .../tutorials/samegame/samegame1/Button.qml        | 17 +++++--
 .../tutorials/samegame/samegame1/samegame.qml      |  7 ++-
 .../tutorials/samegame/samegame2/Block.qml         |  2 +-
 .../tutorials/samegame/samegame2/Button.qml        | 17 +++++--
 .../tutorials/samegame/samegame2/samegame.qml      |  5 +-
 .../tutorials/samegame/samegame3/Button.qml        | 17 +++++--
 .../tutorials/samegame/samegame3/Dialog.qml        | 33 ++++++-------
 .../tutorials/samegame/samegame3/samegame.js       |  9 ++--
 .../tutorials/samegame/samegame3/samegame.qml      | 14 +++---
 .../samegame/samegame4/content/Button.qml          | 17 +++++--
 .../samegame/samegame4/content/Dialog.qml          | 57 ++++++++++++++++------
 .../samegame/samegame4/content/samegame.js         | 17 ++++---
 .../tutorials/samegame/samegame4/samegame.qml      | 38 +++++----------
 19 files changed, 208 insertions(+), 118 deletions(-)

diff --git a/doc/src/declarative/advtutorial.qdoc b/doc/src/declarative/advtutorial.qdoc
index 42ce246..7d2967e 100644
--- a/doc/src/declarative/advtutorial.qdoc
+++ b/doc/src/declarative/advtutorial.qdoc
@@ -109,12 +109,16 @@ Notice the anchors for the \c Item, \c Button and \c Text elements are set using
 
 \section2 Adding \c Button and \c Block components
 
-The \c Button item in the code above is defined in a separate file named \c Button.qml.
+The \c Button item in the code above is defined in a separate component file named \c Button.qml.
 To create a functional button, we use the QML elements \l Text and \l MouseArea inside a \l Rectangle.
 Here is the \c Button.qml code:
 
 \snippet declarative/tutorials/samegame/samegame1/Button.qml 0
 
+This essentially defines a rectangle that contains text and can be clicked. The \l MouseArea
+has an \c onClicked() handler that is implemented to emit the \c clicked() signal of the
+\c container when the area is clicked.
+
 In Same Game, the screen is filled with small blocks when the game begins.
 Each block is just an item that contains an image. The block
 code is defined in a separate \c Block.qml file:
@@ -226,14 +230,14 @@ until it is won or lost.
 To do this, we have added the following functions to \c samegame.js:
 
 \list
-\o function \c{handleClick(x,y)}
-\o function \c{floodFill(xIdx,yIdx,type)}
-\o function \c{shuffleDown()}
-\o function \c{victoryCheck()}
-\o function \c{floodMoveCheck(xIdx, yIdx, type)}
+\o \c{handleClick(x,y)}
+\o \c{floodFill(xIdx,yIdx,type)}
+\o \c{shuffleDown()}
+\o \c{victoryCheck()}
+\o \c{floodMoveCheck(xIdx, yIdx, type)}
 \endlist
 
-As this is a tutorial about QML, not game design, we will only discuss \c handleClick() and \c victoryCheck() below since they interface directly with the QML elements. Note that although the game logic here is written in JavaScript, it could have been written in C++ and then exposed to JavaScript. 
+As this is a tutorial about QML, not game design, we will only discuss \c handleClick() and \c victoryCheck() below since they interface directly with the QML elements. Note that although the game logic here is written in JavaScript, it could have been written in C++ and then exposed to QML. 
 
 \section3 Enabling mouse click interaction
 
@@ -269,6 +273,8 @@ And this is how it is used in the main \c samegame.qml file:
 
 \snippet declarative/tutorials/samegame/samegame3/samegame.qml 2
 
+We give the dialog a \l {Item::z}{z} value of 100 to ensure it is displayed on top of our other components. The default \c z value for an item is 0.
+
 
 \section3 A dash of color
 
@@ -383,15 +389,41 @@ The theme change here is produced simply by replacing the block images. This can
 
 Another feature we might want to add to the game is a method of storing and retrieving high scores.
 
-In \c samegame.qml we now pop up a dialog when the game is over and requests the player's name so it can be added to a High Scores table. The dialog is created using \c Dialog.qml:
+To do this, we will show a dialog when the game is over to request the player's name and add it to a High Scores table.
+This requires a few changes to \c Dialog.qml. In addition to a \c Text element, it now has a
+\c TextInput child item for receiving keyboard text input:
+
+\snippet declarative/tutorials/samegame/samegame4/content/Dialog.qml 0
+\dots 4
+\snippet declarative/tutorials/samegame/samegame4/content/Dialog.qml 2
+\dots 4
+\snippet declarative/tutorials/samegame/samegame4/content/Dialog.qml 3
+
+We'll also add a \c showWithInput() function. The text input will only be visible if this function
+is called instead of \c show(). When the dialog is closed, it emits a \c closed() signal, and
+other elements can retrieve the text entered by the user through an \c inputText property:
+
+\snippet declarative/tutorials/samegame/samegame4/content/Dialog.qml 0
+\snippet declarative/tutorials/samegame/samegame4/content/Dialog.qml 1
+\dots 4
+\snippet declarative/tutorials/samegame/samegame4/content/Dialog.qml 3
+
+Now the dialog can be used in \c samegame.qml:
 
 \snippet declarative/tutorials/samegame/samegame4/samegame.qml 0
 
-When the dialog is closed, we call the new \c saveHighScore() function in \c samegame.js, which stores the high score locally in an SQL database and also send the score to an online database if possible. 
+When the dialog emits the \c closed signal, we call the new \c saveHighScore() function in \c samegame.js, which stores the high score locally in an SQL database and also send the score to an online database if possible. 
 
+The \c nameInputDialog is activated in the \c victoryCheck() function in \c samegame.js:
+
+\snippet declarative/tutorials/samegame/samegame4/content/samegame.js 3
+\dots 4
+\snippet declarative/tutorials/samegame/samegame4/content/samegame.js 4
 
 \section3 Storing high scores offline
 
+Now we need to implement the functionality to actually save the High Scores table.
+
 Here is the \c saveHighScore() function in \c samegame.js:
 
 \snippet declarative/tutorials/samegame/samegame4/content/samegame.js 2
diff --git a/doc/src/declarative/tutorial.qdoc b/doc/src/declarative/tutorial.qdoc
index 1a93d05..4cfb999 100644
--- a/doc/src/declarative/tutorial.qdoc
+++ b/doc/src/declarative/tutorial.qdoc
@@ -86,7 +86,7 @@ Here is the QML code for the application:
 \section2 Import
 
 First, we need to import the types that we need for this example. Most QML files will import the built-in QML
-types (like \l{Rectangle}, \l{Image}, ...) that come with Qt with:
+types (like \l{Rectangle}, \l{Image}, ...) that come with Qt, using:
 
 \snippet examples/declarative/tutorials/helloworld/tutorial1.qml 3
 
@@ -95,7 +95,7 @@ types (like \l{Rectangle}, \l{Image}, ...) that come with Qt with:
 \snippet examples/declarative/tutorials/helloworld/tutorial1.qml 1
 
 We declare a root element of type \l{Rectangle}. It is one of the basic building blocks you can use to create an application in QML.
-We give it an \c{id} to be able to refer to it later. In this case, we call it \e page.
+We give it an \c{id} to be able to refer to it later. In this case, we call it "page".
 We also set the \c width, \c height and \c color properties.
 The \l{Rectangle} element contains many other properties (such as \c x and \c y), but these are left at their default values.
 
@@ -103,15 +103,16 @@ The \l{Rectangle} element contains many other properties (such as \c x and \c y)
 
 \snippet examples/declarative/tutorials/helloworld/tutorial1.qml 2
 
-We add a \l Text element as a child of our root element that will display the text 'Hello world!'.
+We add a \l Text element as a child of the root Rectangle element that displays the text 'Hello world!'.
 
 The \c y property is used to position the text vertically at 30 pixels from the top of its parent.
 
-The \c font.pointSize and \c font.bold properties are related to fonts and use the \l{dot properties}{dot notation}.
-
 The \c anchors.horizontalCenter property refers to the horizontal center of an element.
 In this case, we specify that our text element should be horizontally centered in the \e page element (see \l{anchor-layout}{Anchor-based Layout}).
 
+The \c font.pointSize and \c font.bold properties are related to fonts and use the \l{dot properties}{dot notation}.
+
+
 \section2 Viewing the example
 
 To view what you have created, run the \l{Qt Declarative UI Runtime}{qml} tool (located in the \c bin directory) with your filename as the first argument.
@@ -134,10 +135,10 @@ This chapter adds a color picker to change the color of the text.
 \image declarative-tutorial2.png
 
 Our color picker is made of six cells with different colors.
-To avoid writing the same code multiple times, we first create a new \c Cell component.
+To avoid writing the same code multiple times for each cell, we create a new \c Cell component.
 A component provides a way of defining a new type that we can re-use in other QML files.
 A QML component is like a black-box and interacts with the outside world through properties, signals and slots and is generally
-defined in its own QML file (for more details, see \l {Defining new Components}).
+defined in its own QML file. (For more details, see \l {Defining new Components}).
 The component's filename must always start with a capital letter.
 
 Here is the QML code for \c Cell.qml:
diff --git a/examples/declarative/tutorials/helloworld/tutorial1.qml b/examples/declarative/tutorials/helloworld/tutorial1.qml
index 5e27b45..04cd155 100644
--- a/examples/declarative/tutorials/helloworld/tutorial1.qml
+++ b/examples/declarative/tutorials/helloworld/tutorial1.qml
@@ -14,8 +14,9 @@ Rectangle {
     Text {
         id: helloText
         text: "Hello world!"
+        y: 30
+        anchors.horizontalCenter: page.horizontalCenter
         font.pointSize: 24; font.bold: true
-        y: 30; anchors.horizontalCenter: page.horizontalCenter
     }
 //![2]
 }
diff --git a/examples/declarative/tutorials/helloworld/tutorial2.qml b/examples/declarative/tutorials/helloworld/tutorial2.qml
index 085efa4..66be509 100644
--- a/examples/declarative/tutorials/helloworld/tutorial2.qml
+++ b/examples/declarative/tutorials/helloworld/tutorial2.qml
@@ -9,8 +9,9 @@ Rectangle {
     Text {
         id: helloText
         text: "Hello world!"
+        y: 30
+        anchors.horizontalCenter: page.horizontalCenter
         font.pointSize: 24; font.bold: true
-        y: 30; anchors.horizontalCenter: page.horizontalCenter
     }
 
     Grid {
diff --git a/examples/declarative/tutorials/helloworld/tutorial3.qml b/examples/declarative/tutorials/helloworld/tutorial3.qml
index 4bf4970..041d9a9 100644
--- a/examples/declarative/tutorials/helloworld/tutorial3.qml
+++ b/examples/declarative/tutorials/helloworld/tutorial3.qml
@@ -9,8 +9,9 @@ Rectangle {
     Text {
         id: helloText
         text: "Hello world!"
+        y: 30
+        anchors.horizontalCenter: page.horizontalCenter
         font.pointSize: 24; font.bold: true
-        y: 30; anchors.horizontalCenter: page.horizontalCenter
 
 //![1]
         MouseArea { id: mouseArea; anchors.fill: parent }
diff --git a/examples/declarative/tutorials/samegame/samegame1/Block.qml b/examples/declarative/tutorials/samegame/samegame1/Block.qml
index a23654b..11fd844 100644
--- a/examples/declarative/tutorials/samegame/samegame1/Block.qml
+++ b/examples/declarative/tutorials/samegame/samegame1/Block.qml
@@ -7,7 +7,7 @@ Item {
     Image {
         id: img
         anchors.fill: parent
-        source: "../shared/pics/redStone.png";
+        source: "../shared/pics/redStone.png"
     }
 }
 //![0]
diff --git a/examples/declarative/tutorials/samegame/samegame1/Button.qml b/examples/declarative/tutorials/samegame/samegame1/Button.qml
index e84b1ce..96a80eb 100644
--- a/examples/declarative/tutorials/samegame/samegame1/Button.qml
+++ b/examples/declarative/tutorials/samegame/samegame1/Button.qml
@@ -8,9 +8,9 @@ Rectangle {
 
     signal clicked
 
-    width: buttonLabel.width + 20; height: buttonLabel.height + 6
-    smooth: true
+    width: buttonLabel.width + 20; height: buttonLabel.height + 5
     border { width: 1; color: Qt.darker(activePalette.button) }
+    smooth: true
     radius: 8
 
     // color the button with a gradient
@@ -27,8 +27,17 @@ Rectangle {
         GradientStop { position: 1.0; color: activePalette.button }
     }
 
-    MouseArea { id: mouseArea; anchors.fill: parent; onClicked: container.clicked() }
+    MouseArea {
+        id: mouseArea
+        anchors.fill: parent
+        onClicked: container.clicked();
+    }
 
-    Text { id: buttonLabel; text: container.text; anchors.centerIn: container; color: activePalette.buttonText }
+    Text {
+        id: buttonLabel
+        anchors.centerIn: container
+        color: activePalette.buttonText
+        text: container.text
+    }
 }
 //![0]
diff --git a/examples/declarative/tutorials/samegame/samegame1/samegame.qml b/examples/declarative/tutorials/samegame/samegame1/samegame.qml
index b6e01fd..f2974be 100644
--- a/examples/declarative/tutorials/samegame/samegame1/samegame.qml
+++ b/examples/declarative/tutorials/samegame/samegame1/samegame.qml
@@ -22,21 +22,20 @@ Rectangle {
 
     Rectangle {
         id: toolBar
-        width: parent.width; height: 32
+        width: parent.width; height: 30
         color: activePalette.window
         anchors.bottom: screen.bottom
 
         Button {
-            anchors { left: parent.left; leftMargin: 3; verticalCenter: parent.verticalCenter }
+            anchors { left: parent.left; verticalCenter: parent.verticalCenter }
             text: "New Game" 
             onClicked: console.log("This doesn't do anything yet...")
         }
 
         Text {
             id: score
-            anchors { right: parent.right; rightMargin: 3; verticalCenter: parent.verticalCenter }
+            anchors { right: parent.right; verticalCenter: parent.verticalCenter }
             text: "Score: Who knows?"
-            font.bold: true
         }
     }
 }
diff --git a/examples/declarative/tutorials/samegame/samegame2/Block.qml b/examples/declarative/tutorials/samegame/samegame2/Block.qml
index 4e71e60..39da84e 100644
--- a/examples/declarative/tutorials/samegame/samegame2/Block.qml
+++ b/examples/declarative/tutorials/samegame/samegame2/Block.qml
@@ -6,6 +6,6 @@ Item {
     Image {
         id: img
         anchors.fill: parent
-        source: "../shared/pics/redStone.png";
+        source: "../shared/pics/redStone.png"
     }
 }
diff --git a/examples/declarative/tutorials/samegame/samegame2/Button.qml b/examples/declarative/tutorials/samegame/samegame2/Button.qml
index 737d886..4ed856b 100644
--- a/examples/declarative/tutorials/samegame/samegame2/Button.qml
+++ b/examples/declarative/tutorials/samegame/samegame2/Button.qml
@@ -7,9 +7,9 @@ Rectangle {
 
     signal clicked
 
-    width: buttonLabel.width + 20; height: buttonLabel.height + 6
-    smooth: true
+    width: buttonLabel.width + 20; height: buttonLabel.height + 5
     border { width: 1; color: Qt.darker(activePalette.button) }
+    smooth: true
     radius: 8
 
     // color the button with a gradient
@@ -26,7 +26,16 @@ Rectangle {
         GradientStop { position: 1.0; color: activePalette.button }
     }
 
-    MouseArea { id: mouseArea; anchors.fill: parent; onClicked: container.clicked() }
+    MouseArea {
+        id: mouseArea
+        anchors.fill: parent
+        onClicked: container.clicked();
+    }
 
-    Text { id: buttonLabel; text: container.text; anchors.centerIn: container; color: activePalette.buttonText }
+    Text {
+        id: buttonLabel
+        anchors.centerIn: container
+        color: activePalette.buttonText
+        text: container.text
+    }
 }
diff --git a/examples/declarative/tutorials/samegame/samegame2/samegame.qml b/examples/declarative/tutorials/samegame/samegame2/samegame.qml
index a7d1fba..9b4d4d5 100644
--- a/examples/declarative/tutorials/samegame/samegame2/samegame.qml
+++ b/examples/declarative/tutorials/samegame/samegame2/samegame.qml
@@ -30,7 +30,7 @@ Rectangle {
 
 //![1]
         Button {
-            anchors { left: parent.left; leftMargin: 3; verticalCenter: parent.verticalCenter }
+            anchors { left: parent.left; verticalCenter: parent.verticalCenter }
             text: "New Game"
             onClicked: SameGame.startNewGame()
         }
@@ -38,9 +38,8 @@ Rectangle {
 
         Text {
             id: score
-            anchors { right: parent.right; rightMargin: 3; verticalCenter: parent.verticalCenter }
+            anchors { right: parent.right; verticalCenter: parent.verticalCenter }
             text: "Score: Who knows?"
-            font.bold: true
         }
     }
 }
diff --git a/examples/declarative/tutorials/samegame/samegame3/Button.qml b/examples/declarative/tutorials/samegame/samegame3/Button.qml
index 737d886..4ed856b 100644
--- a/examples/declarative/tutorials/samegame/samegame3/Button.qml
+++ b/examples/declarative/tutorials/samegame/samegame3/Button.qml
@@ -7,9 +7,9 @@ Rectangle {
 
     signal clicked
 
-    width: buttonLabel.width + 20; height: buttonLabel.height + 6
-    smooth: true
+    width: buttonLabel.width + 20; height: buttonLabel.height + 5
     border { width: 1; color: Qt.darker(activePalette.button) }
+    smooth: true
     radius: 8
 
     // color the button with a gradient
@@ -26,7 +26,16 @@ Rectangle {
         GradientStop { position: 1.0; color: activePalette.button }
     }
 
-    MouseArea { id: mouseArea; anchors.fill: parent; onClicked: container.clicked() }
+    MouseArea {
+        id: mouseArea
+        anchors.fill: parent
+        onClicked: container.clicked();
+    }
 
-    Text { id: buttonLabel; text: container.text; anchors.centerIn: container; color: activePalette.buttonText }
+    Text {
+        id: buttonLabel
+        anchors.centerIn: container
+        color: activePalette.buttonText
+        text: container.text
+    }
 }
diff --git a/examples/declarative/tutorials/samegame/samegame3/Dialog.qml b/examples/declarative/tutorials/samegame/samegame3/Dialog.qml
index 15b3b2f..3efed2f 100644
--- a/examples/declarative/tutorials/samegame/samegame3/Dialog.qml
+++ b/examples/declarative/tutorials/samegame/samegame3/Dialog.qml
@@ -2,31 +2,30 @@
 import Qt 4.7
 
 Rectangle {
-    id: page
+    id: container
 
-    signal closed
-
-    function forceClose() {
-        page.closed();
-        page.opacity = 0;
+    function show(text) {
+        dialogText.text = text;
+        container.opacity = 1;
     }
 
-    function show(txt) {
-        dialogText.text = txt;
-        page.opacity = 1;
+    function hide() {
+        container.opacity = 0;
     }
 
-    width: dialogText.width + 20; height: dialogText.height + 20
-    color: "white"
-    border.width: 1
+    width: dialogText.width + 20
+    height: dialogText.height + 20
     opacity: 0
 
-    Behavior on opacity {
-        NumberAnimation { duration: 1000 }
+    Text {
+        id: dialogText
+        anchors.centerIn: parent
+        text: ""
     }
 
-    Text { id: dialogText; anchors.centerIn: parent; text: "Hello World!" }
-
-    MouseArea { anchors.fill: parent; onClicked: forceClose(); }
+    MouseArea {
+        anchors.fill: parent
+        onClicked: hide();
+    }
 }
 //![0]
diff --git a/examples/declarative/tutorials/samegame/samegame3/samegame.js b/examples/declarative/tutorials/samegame/samegame3/samegame.js
index 4256aee..84439fc 100644
--- a/examples/declarative/tutorials/samegame/samegame3/samegame.js
+++ b/examples/declarative/tutorials/samegame/samegame3/samegame.js
@@ -17,7 +17,7 @@ function startNewGame() {
     maxIndex = maxRow * maxColumn;
 
     //Close dialogs
-    dialog.forceClose();
+    dialog.hide();
 
     //Initialize Board
     board = new Array(maxIndex);
@@ -59,10 +59,9 @@ function createBlock(column, row) {
     return true;
 }
 
-var fillFound;
-//Set after a floodFill call to the number of blocks found
-var floodBoard;
-//Set to 1 if the floodFill reaches off that node
+var fillFound; //Set after a floodFill call to the number of blocks found
+var floodBoard; //Set to 1 if the floodFill reaches off that node
+
 //![1]
 function handleClick(xPos, yPos) {
     var column = Math.floor(xPos / gameCanvas.blockSize);
diff --git a/examples/declarative/tutorials/samegame/samegame3/samegame.qml b/examples/declarative/tutorials/samegame/samegame3/samegame.qml
index 50f9d5d..ac93eb1 100644
--- a/examples/declarative/tutorials/samegame/samegame3/samegame.qml
+++ b/examples/declarative/tutorials/samegame/samegame3/samegame.qml
@@ -30,7 +30,6 @@ Rectangle {
             width: parent.width - (parent.width % blockSize)
             height: parent.height - (parent.height % blockSize)
             anchors.centerIn: parent
-            z: 20
 
             MouseArea {
                 anchors.fill: parent
@@ -41,26 +40,29 @@ Rectangle {
     }
 
 //![2]
-    Dialog { id: dialog; anchors.centerIn: parent; z: 21 }
+    Dialog {
+        id: dialog
+        anchors.centerIn: parent
+        z: 100
+    }
 //![2]
 
     Rectangle {
         id: toolBar
-        width: parent.width; height: 32
+        width: parent.width; height: 30
         color: activePalette.window
         anchors.bottom: screen.bottom
 
         Button {
-            anchors { left: parent.left; leftMargin: 3; verticalCenter: parent.verticalCenter }
+            anchors { left: parent.left; verticalCenter: parent.verticalCenter }
             text: "New Game"
             onClicked: SameGame.startNewGame()
         }
 
         Text {
             id: score
-            anchors { right: parent.right; rightMargin: 3; verticalCenter: parent.verticalCenter }
+            anchors { right: parent.right; verticalCenter: parent.verticalCenter }
             text: "Score: Who knows?"
-            font.bold: true
         }
     }
 }
diff --git a/examples/declarative/tutorials/samegame/samegame4/content/Button.qml b/examples/declarative/tutorials/samegame/samegame4/content/Button.qml
index 737d886..4ed856b 100644
--- a/examples/declarative/tutorials/samegame/samegame4/content/Button.qml
+++ b/examples/declarative/tutorials/samegame/samegame4/content/Button.qml
@@ -7,9 +7,9 @@ Rectangle {
 
     signal clicked
 
-    width: buttonLabel.width + 20; height: buttonLabel.height + 6
-    smooth: true
+    width: buttonLabel.width + 20; height: buttonLabel.height + 5
     border { width: 1; color: Qt.darker(activePalette.button) }
+    smooth: true
     radius: 8
 
     // color the button with a gradient
@@ -26,7 +26,16 @@ Rectangle {
         GradientStop { position: 1.0; color: activePalette.button }
     }
 
-    MouseArea { id: mouseArea; anchors.fill: parent; onClicked: container.clicked() }
+    MouseArea {
+        id: mouseArea
+        anchors.fill: parent
+        onClicked: container.clicked();
+    }
 
-    Text { id: buttonLabel; text: container.text; anchors.centerIn: container; color: activePalette.buttonText }
+    Text {
+        id: buttonLabel
+        anchors.centerIn: container
+        color: activePalette.buttonText
+        text: container.text
+    }
 }
diff --git a/examples/declarative/tutorials/samegame/samegame4/content/Dialog.qml b/examples/declarative/tutorials/samegame/samegame4/content/Dialog.qml
index 6848534..2f45362 100644
--- a/examples/declarative/tutorials/samegame/samegame4/content/Dialog.qml
+++ b/examples/declarative/tutorials/samegame/samegame4/content/Dialog.qml
@@ -1,30 +1,59 @@
 import Qt 4.7
 
+//![0]
 Rectangle {
-    id: page
+    id: container
+//![0]
 
+//![1]
+    property string inputText: textInput.text
     signal closed
 
-    function forceClose() {
-        page.closed();
-        page.opacity = 0;
+    function show(text) {
+        dialogText.text = text;
+        container.opacity = 1;
+        textInput.opacity = 0;
     }
 
-    function show(txt) {
-        dialogText.text = txt;
-        page.opacity = 1;
+    function showWithInput(text) {
+        show(text);
+        textInput.opacity = 1;
+        textInput.text = ""
     }
 
-    width: dialogText.width + 20; height: dialogText.height + 20
-    color: "white"
-    border.width: 1
+    function hide() {
+        container.opacity = 0;
+        container.closed();
+    }
+//![1]
+
+    width: dialogText.width + textInput.width + 20
+    height: dialogText.height + 20
     opacity: 0
 
-    Behavior on opacity {
-        NumberAnimation { duration: 1000 }
+    Text {
+        id: dialogText
+        anchors { verticalCenter: parent.verticalCenter; left: parent.left; leftMargin: 10 }
+        text: ""
+    }
+
+//![2]
+    TextInput {
+        id: textInput
+        anchors { verticalCenter: parent.verticalCenter; left: dialogText.right }
+        width: 80
+        focus: true
+        text: ""
+
+        onAccepted: container.hide()    // close dialog when Enter is pressed
     }
+//![2]
 
-    Text { id: dialogText; anchors.centerIn: parent; text: "Hello World!" }
+    MouseArea {
+        anchors.fill: parent
+        onClicked: hide();
+    }
 
-    MouseArea { anchors.fill: parent; onClicked: forceClose(); }
+//![3]
 }
+//![3]
diff --git a/examples/declarative/tutorials/samegame/samegame4/content/samegame.js b/examples/declarative/tutorials/samegame/samegame4/content/samegame.js
index 961cd66..06d21e6 100755
--- a/examples/declarative/tutorials/samegame/samegame4/content/samegame.js
+++ b/examples/declarative/tutorials/samegame/samegame4/content/samegame.js
@@ -25,8 +25,8 @@ function startNewGame() {
     maxIndex = maxRow * maxColumn;
 
     //Close dialogs
-    nameInputDialog.forceClose();
-    dialog.forceClose();
+    nameInputDialog.hide();
+    dialog.hide();
 
     //Initialize Board
     board = new Array(maxIndex);
@@ -72,10 +72,9 @@ function createBlock(column, row) {
     return true;
 }
 
-var fillFound;
-//Set after a floodFill call to the number of blocks found
-var floodBoard;
-//Set to 1 if the floodFill reaches off that node
+var fillFound; //Set after a floodFill call to the number of blocks found
+var floodBoard; //Set to 1 if the floodFill reaches off that node
+
 function handleClick(xPos, yPos) {
     var column = Math.floor(xPos / gameCanvas.blockSize);
     var row = Math.floor(yPos / gameCanvas.blockSize);
@@ -157,7 +156,9 @@ function shuffleDown() {
     }
 }
 
+//![3]
 function victoryCheck() {
+//![3]
     //Award bonus points if no blocks left
     var deservesBonus = true;
     for (var column = maxColumn - 1; column >= 0; column--)
@@ -166,12 +167,14 @@ function victoryCheck() {
     if (deservesBonus)
         gameCanvas.score += 500;
 
+//![4]
     //Check whether game has finished
     if (deservesBonus || !(floodMoveCheck(0, maxRow - 1, -1))) {
         gameDuration = new Date() - gameDuration;
-        nameInputDialog.show("You won! Please enter your name:                 ");
+        nameInputDialog.showWithInput("You won! Please enter your name: ");
     }
 }
+//![4]
 
 //only floods up and right, to see if it can find adjacent same-typed blocks 
 function floodMoveCheck(column, row, type) {
diff --git a/examples/declarative/tutorials/samegame/samegame4/samegame.qml b/examples/declarative/tutorials/samegame/samegame4/samegame.qml
index 404af0a..feb61fd 100644
--- a/examples/declarative/tutorials/samegame/samegame4/samegame.qml
+++ b/examples/declarative/tutorials/samegame/samegame4/samegame.qml
@@ -25,7 +25,7 @@ Rectangle {
             property int score: 0
             property int blockSize: 40
 
-            z: 20; anchors.centerIn: parent
+            anchors.centerIn: parent
             width: parent.width - (parent.width % blockSize);
             height: parent.height - (parent.height % blockSize);
 
@@ -35,53 +35,41 @@ Rectangle {
         }
     }
 
-    Dialog { id: dialog; anchors.centerIn: parent; z: 21 }
+    Dialog {
+        id: dialog
+        anchors.centerIn: parent
+        z: 100
+    }
 
     //![0]
     Dialog {
         id: nameInputDialog
-
         anchors.centerIn: parent
-        z: 22
+        z: 100
 
-        Text {
-            id: dialogText
-            opacity: 0
-            text: "   You won! Please enter your name:"
-        }
-
-        TextInput {
-            id: nameInput
-            width: 72
-            anchors { verticalCenter: parent.verticalCenter; left: dialogText.right }
-            focus: true
-
-            onAccepted: {
-                if (nameInputDialog.opacity == 1 && nameInput.text != "")
-                    SameGame.saveHighScore(nameInput.text);
-                nameInputDialog.forceClose();
-            }
+        onClosed: {
+            if (nameInputDialog.inputText != "")
+                SameGame.saveHighScore(nameInputDialog.inputText);
         }
     }
     //![0]
 
     Rectangle {
         id: toolBar
-        width: parent.width; height: 32
+        width: parent.width; height: 30
         color: activePalette.window
         anchors.bottom: screen.bottom
 
         Button {
-            anchors { left: parent.left; leftMargin: 3; verticalCenter: parent.verticalCenter }
+            anchors { left: parent.left; verticalCenter: parent.verticalCenter }
             text: "New Game"
             onClicked: SameGame.startNewGame()
         }
 
         Text {
             id: score
-            anchors { right: parent.right; rightMargin: 3; verticalCenter: parent.verticalCenter }
+            anchors { right: parent.right; verticalCenter: parent.verticalCenter }
             text: "Score: " + gameCanvas.score
-            font.bold: true
         }
     }
 }
-- 
cgit v0.12


From c76d98da76fd687d2953f0026b16bca3c7fcf485 Mon Sep 17 00:00:00 2001
From: Warwick Allison 
Date: Wed, 5 May 2010 13:24:25 +1000
Subject: Allow translations without extra command-line args, and document
 both.

---
 doc/src/declarative/qmlruntime.qdoc | 17 +++++++++
 tools/qml/qmlruntime.cpp            | 72 +++++++++++++++++++++++--------------
 tools/qml/qmlruntime.h              |  6 ++++
 3 files changed, 68 insertions(+), 27 deletions(-)

diff --git a/doc/src/declarative/qmlruntime.qdoc b/doc/src/declarative/qmlruntime.qdoc
index a724c7d..23c5c32 100644
--- a/doc/src/declarative/qmlruntime.qdoc
+++ b/doc/src/declarative/qmlruntime.qdoc
@@ -112,6 +112,23 @@
 
     When run with the \c -help option, qml shows available options.
 
+    \section2 Translations
+
+    When the runtime loads an initial QML file, it will install a translation file from
+    a "i18n" subdirectory relative to that initial QML file. The actual translation file
+    loaded will be according to the system locale and have the form
+    "qml_.qm", where  is a two-letter ISO 639 language,
+    such as "qml_fr.qm", optionally followed by an underscore and an uppercase two-letter ISO 3166 country
+    code, such as "qml_fr_FR.qm" or "qml_fr_CA.qm".
+
+    Such files can be created using \l{Qt Linguist}.
+
+    See \l{scripting.html#internationalization} for information about how to make
+    the JavaScript in QML files use translatable strings.
+
+    Additionally, the QML runtime will load translation files specified on the
+    command line via the \c -translation option.
+
     \section2 Dummy Data
 
     The secondary use of the qml runtime is to allow QML files to be viewed with
diff --git a/tools/qml/qmlruntime.cpp b/tools/qml/qmlruntime.cpp
index 008f163..da31284 100644
--- a/tools/qml/qmlruntime.cpp
+++ b/tools/qml/qmlruntime.cpp
@@ -66,6 +66,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -464,6 +465,7 @@ QDeclarativeViewer::QDeclarativeViewer(QWidget *parent, Qt::WindowFlags flags)
       , frame_stream(0), scaleSkin(true), mb(0)
       , portraitOrientation(0), landscapeOrientation(0)
       , m_scriptOptions(0), tester(0), useQmlFileBrowser(true)
+      , translator(0)
 {
     QDeclarativeViewer::registerTypes();
     setWindowTitle(tr("Qt Qml Runtime"));
@@ -937,6 +939,46 @@ void QDeclarativeViewer::launch(const QString& file_or_url)
     QMetaObject::invokeMethod(this, "open", Qt::QueuedConnection, Q_ARG(QString, file_or_url));
 }
 
+void QDeclarativeViewer::loadTranslationFile(const QString& directory)
+{
+    if (!translator) {
+        translator = new QTranslator(this);
+        QApplication::installTranslator(translator);
+    }
+
+    translator->load(QLatin1String("qml_" )+QLocale::system().name(), directory + QLatin1String("/i18n"));
+}
+
+void QDeclarativeViewer::loadDummyDataFiles(const QString& directory)
+{
+    QDir dir(directory+"/dummydata", "*.qml");
+    QStringList list = dir.entryList();
+    for (int i = 0; i < list.size(); ++i) {
+        QString qml = list.at(i);
+        QFile f(dir.filePath(qml));
+        f.open(QIODevice::ReadOnly);
+        QByteArray data = f.readAll();
+        QDeclarativeComponent comp(canvas->engine());
+        comp.setData(data, QUrl());
+        QObject *dummyData = comp.create();
+
+        if(comp.isError()) {
+            QList errors = comp.errors();
+            foreach (const QDeclarativeError &error, errors) {
+                qWarning() << error;
+            }
+            if (tester) tester->executefailure();
+        }
+
+        if (dummyData) {
+            qWarning() << "Loaded dummy data:" << dir.filePath(qml);
+            qml.truncate(qml.length()-4);
+            canvas->rootContext()->setContextProperty(qml, dummyData);
+            dummyData->setParent(this);
+        }
+    }
+}
+
 bool QDeclarativeViewer::open(const QString& file_or_url)
 {
     currentFileOrUrl = file_or_url;
@@ -966,39 +1008,15 @@ bool QDeclarativeViewer::open(const QString& file_or_url)
 
     QString fileName = url.toLocalFile();
     if (!fileName.isEmpty()) {
-        QFileInfo fi(fileName);
         if (fi.exists()) {
             if (fi.suffix().toLower() != QLatin1String("qml")) {
                 qWarning() << "qml cannot open non-QML file" << fileName;
                 return false;
             }
 
-            QDir dir(fi.path()+"/dummydata", "*.qml");
-            QStringList list = dir.entryList();
-            for (int i = 0; i < list.size(); ++i) {
-                QString qml = list.at(i);
-                QFile f(dir.filePath(qml));
-                f.open(QIODevice::ReadOnly);
-                QByteArray data = f.readAll();
-                QDeclarativeComponent comp(canvas->engine());
-                comp.setData(data, QUrl());
-                QObject *dummyData = comp.create();
-
-                if(comp.isError()) {
-                    QList errors = comp.errors();
-                    foreach (const QDeclarativeError &error, errors) {
-                        qWarning() << error;
-                    }
-                    if (tester) tester->executefailure();
-                }
-
-                if (dummyData) {
-                    qWarning() << "Loaded dummy data:" << dir.filePath(qml);
-                    qml.truncate(qml.length()-4);
-                    ctxt->setContextProperty(qml, dummyData);
-                    dummyData->setParent(this);
-                }
-            }
+            QFileInfo fi(fileName);
+            loadTranslationFile(fi.path());
+            loadDummyDataFiles(fi.path());
         } else {
             qWarning() << "qml cannot find file:" << fileName;
             return false;
diff --git a/tools/qml/qmlruntime.h b/tools/qml/qmlruntime.h
index 2a0a07d..0b23303 100644
--- a/tools/qml/qmlruntime.h
+++ b/tools/qml/qmlruntime.h
@@ -59,6 +59,7 @@ class QDeclarativeTester;
 class QNetworkReply;
 class QNetworkCookieJar;
 class NetworkAccessManagerFactory;
+class QTranslator;
 
 class QDeclarativeViewer
 #if defined(Q_OS_SYMBIAN)
@@ -192,6 +193,11 @@ private:
     NetworkAccessManagerFactory *namFactory;
 
     bool useQmlFileBrowser;
+
+    QTranslator *translator;
+    void loadTranslationFile(const QString& directory);
+
+    void loadDummyDataFiles(const QString& directory);
 };
 Q_DECLARE_OPERATORS_FOR_FLAGS(QDeclarativeViewer::ScriptOptions)
 
-- 
cgit v0.12


From 9719866c686805d69b0026f555c97594e09c836f Mon Sep 17 00:00:00 2001
From: Warwick Allison 
Date: Wed, 5 May 2010 13:35:11 +1000
Subject: Example i18n.

---
 examples/declarative/i18n/i18n.qml          |  33 ++++++++++++++++++++++++++++
 examples/declarative/i18n/i18n/base.ts      |  12 ++++++++++
 examples/declarative/i18n/i18n/qml_en_AU.qm | Bin 0 -> 81 bytes
 examples/declarative/i18n/i18n/qml_en_AU.ts |  12 ++++++++++
 examples/declarative/i18n/i18n/qml_fr.qm    | Bin 0 -> 85 bytes
 examples/declarative/i18n/i18n/qml_fr.ts    |  12 ++++++++++
 6 files changed, 69 insertions(+)
 create mode 100644 examples/declarative/i18n/i18n.qml
 create mode 100644 examples/declarative/i18n/i18n/base.ts
 create mode 100644 examples/declarative/i18n/i18n/qml_en_AU.qm
 create mode 100644 examples/declarative/i18n/i18n/qml_en_AU.ts
 create mode 100644 examples/declarative/i18n/i18n/qml_fr.qm
 create mode 100644 examples/declarative/i18n/i18n/qml_fr.ts

diff --git a/examples/declarative/i18n/i18n.qml b/examples/declarative/i18n/i18n.qml
new file mode 100644
index 0000000..3b1279a
--- /dev/null
+++ b/examples/declarative/i18n/i18n.qml
@@ -0,0 +1,33 @@
+import Qt 4.7
+
+//
+// The QML runtime automatically loads a translation from the i18n subdirectory of the root
+// QML file, based on the system language.
+//
+// The files are created/updated by running:
+//
+//   lupdate i18n.qml -ts i18n/*.ts
+//
+// The .ts files can then be edited with Linguist:
+//
+//   linguist i18n/qml_fr.ts
+//
+// The run-time translation files are then generaeted by running:
+//
+//   lrelease i18n/*.ts
+//
+// Translations for new languages are created by copying i18n/base.ts to i18n/qml_.ts
+// and editing the result with Linguist.
+//
+
+Column {
+    Text {
+        text: "If a translation is available for the system language (eg. Franch) then the string below will translated (eg. 'Bonjour'). Otherwise is will show 'Hello'."
+        width: 200
+        wrapMode: Text.WordWrap
+    }
+    Text {
+        text: qsTr("Hello")
+        font.pointSize: 25
+    }
+}
diff --git a/examples/declarative/i18n/i18n/base.ts b/examples/declarative/i18n/i18n/base.ts
new file mode 100644
index 0000000..82547a1
--- /dev/null
+++ b/examples/declarative/i18n/i18n/base.ts
@@ -0,0 +1,12 @@
+
+
+
+
+    i18n
+    
+        
+        Hello
+        
+    
+
+
diff --git a/examples/declarative/i18n/i18n/qml_en_AU.qm b/examples/declarative/i18n/i18n/qml_en_AU.qm
new file mode 100644
index 0000000..fb8b710
Binary files /dev/null and b/examples/declarative/i18n/i18n/qml_en_AU.qm differ
diff --git a/examples/declarative/i18n/i18n/qml_en_AU.ts b/examples/declarative/i18n/i18n/qml_en_AU.ts
new file mode 100644
index 0000000..e991aff
--- /dev/null
+++ b/examples/declarative/i18n/i18n/qml_en_AU.ts
@@ -0,0 +1,12 @@
+
+
+
+
+    i18n
+    
+        
+        Hello
+        G'day
+    
+
+
diff --git a/examples/declarative/i18n/i18n/qml_fr.qm b/examples/declarative/i18n/i18n/qml_fr.qm
new file mode 100644
index 0000000..583562e
Binary files /dev/null and b/examples/declarative/i18n/i18n/qml_fr.qm differ
diff --git a/examples/declarative/i18n/i18n/qml_fr.ts b/examples/declarative/i18n/i18n/qml_fr.ts
new file mode 100644
index 0000000..365abd9
--- /dev/null
+++ b/examples/declarative/i18n/i18n/qml_fr.ts
@@ -0,0 +1,12 @@
+
+
+
+
+    i18n
+    
+        
+        Hello
+        Bonjour
+    
+
+
-- 
cgit v0.12


From 846210c6381827396868d15cdbb6d42daabda147 Mon Sep 17 00:00:00 2001
From: Michael Brasser 
Date: Wed, 5 May 2010 14:32:45 +1000
Subject: Don't start valuesource animations until all component objects have
 been completed.

Task-number: QTBUG-9413
---
 src/declarative/util/qdeclarativeanimation.cpp                 | 10 ++++++++++
 src/declarative/util/qdeclarativeanimation_p.h                 |  1 +
 .../animation/pauseAnimation/pauseAnimation-visual.qml         |  4 ++--
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp
index 4059522..d9abe71 100644
--- a/src/declarative/util/qdeclarativeanimation.cpp
+++ b/src/declarative/util/qdeclarativeanimation.cpp
@@ -55,6 +55,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -178,6 +179,10 @@ void QDeclarativeAbstractAnimation::setRunning(bool r)
         d->running = r;
         if (r == false)
             d->avoidPropertyValueSourceStart = true;
+        else {
+            QDeclarativeEnginePrivate *engPriv = QDeclarativeEnginePrivate::get(qmlEngine(this));
+            engPriv->registerFinalizedParserStatusObject(this, this->metaObject()->indexOfSlot("componentFinalized()"));
+        }
         return;
     }
 
@@ -268,6 +273,11 @@ void QDeclarativeAbstractAnimation::componentComplete()
 {
     Q_D(QDeclarativeAbstractAnimation);
     d->componentComplete = true;
+}
+
+void QDeclarativeAbstractAnimation::componentFinalized()
+{
+    Q_D(QDeclarativeAbstractAnimation);
     if (d->running) {
         d->running = false;
         setRunning(true);
diff --git a/src/declarative/util/qdeclarativeanimation_p.h b/src/declarative/util/qdeclarativeanimation_p.h
index 40c893c..e7cd8a8 100644
--- a/src/declarative/util/qdeclarativeanimation_p.h
+++ b/src/declarative/util/qdeclarativeanimation_p.h
@@ -133,6 +133,7 @@ public:
 
 private Q_SLOTS:
     void timelineComplete();
+    void componentFinalized();
 
 private:
     virtual void setTarget(const QDeclarativeProperty &);
diff --git a/tests/auto/declarative/qmlvisual/animation/pauseAnimation/pauseAnimation-visual.qml b/tests/auto/declarative/qmlvisual/animation/pauseAnimation/pauseAnimation-visual.qml
index d82c6df..cc9a639 100644
--- a/tests/auto/declarative/qmlvisual/animation/pauseAnimation/pauseAnimation-visual.qml
+++ b/tests/auto/declarative/qmlvisual/animation/pauseAnimation/pauseAnimation-visual.qml
@@ -16,7 +16,7 @@ Rectangle {
         id: img
         source: "pics/qtlogo.png"
         x: 60-width/2
-        y: 100
+        y: 200-img.height
         SequentialAnimation on y {
             loops: Animation.Infinite
             NumberAnimation {
@@ -24,7 +24,7 @@ Rectangle {
                 easing.type: "InOutQuad"
             }
             NumberAnimation {
-                to: 100
+                to: 200-img.height
                 easing.type: "OutBounce"
                 duration: 2000
             }
-- 
cgit v0.12


From ce9bc843443f2c61361afa75a62a7d39029557e6 Mon Sep 17 00:00:00 2001
From: Martin Jones 
Date: Wed, 5 May 2010 14:38:55 +1000
Subject: QList models now update their properties when they change.

Task-number: QTBUG-10348
---
 doc/src/declarative/qdeclarativemodels.qdoc           | 11 +++++++++--
 examples/declarative/objectlistmodel/dataobject.cpp   | 10 ++++++++--
 examples/declarative/objectlistmodel/dataobject.h     |  8 ++++++--
 examples/declarative/objectlistmodel/view.qml         |  2 +-
 src/declarative/QmlChanges.txt                        |  4 ++++
 .../graphicsitems/qdeclarativevisualitemmodel.cpp     |  8 ++++++--
 .../declarative/qdeclarativerepeater/data/objlist.qml |  2 +-
 .../qdeclarativerepeater/tst_qdeclarativerepeater.cpp | 19 ++++++++++++++-----
 8 files changed, 49 insertions(+), 15 deletions(-)

diff --git a/doc/src/declarative/qdeclarativemodels.qdoc b/doc/src/declarative/qdeclarativemodels.qdoc
index 91acb3c..9b706a1 100644
--- a/doc/src/declarative/qdeclarativemodels.qdoc
+++ b/doc/src/declarative/qdeclarativemodels.qdoc
@@ -283,7 +283,9 @@ QDeclarativeContext *ctxt = view.rootContext();
 ctxt->setContextProperty("myModel", QVariant::fromValue(dataList));
 \endcode
 
-The properties of the object may then be accessed in the delegate:
+The QObject* is available as the \c modelData property.  As a convenience,
+the properties of the object are also made available directly in the
+delegate's context:
 
 \code
 ListView {
@@ -295,13 +297,18 @@ ListView {
        Rectangle {
             height: 25
             width: 100
-            color: model.color
+            color: model.modelData.color
             Text { text: name }
        }
    }
 }
 \endcode
 
+Note the use of the fully qualified access to the \c color property.  
+The properties of the object are not replicated in the \c model
+object, since they are easily available via the modelData
+object.
+
 Note: There is no way for the view to know that the contents of a QList
 have changed.  If the QList is changed, it will be necessary to reset
 the model by calling QDeclarativeContext::setContextProperty() again.
diff --git a/examples/declarative/objectlistmodel/dataobject.cpp b/examples/declarative/objectlistmodel/dataobject.cpp
index 4c44ee4..14be1b9 100644
--- a/examples/declarative/objectlistmodel/dataobject.cpp
+++ b/examples/declarative/objectlistmodel/dataobject.cpp
@@ -59,7 +59,10 @@ QString DataObject::name() const
 
 void DataObject::setName(const QString &name)
 {
-    m_name = name;
+    if (name != m_name) {
+        m_name = name;
+        emit nameChanged();
+    }
 }
 
 QString DataObject::color() const
@@ -69,5 +72,8 @@ QString DataObject::color() const
 
 void DataObject::setColor(const QString &color)
 {
-    m_color = color;
+    if (color != m_color) {
+        m_color = color;
+        emit colorChanged();
+    }
 }
diff --git a/examples/declarative/objectlistmodel/dataobject.h b/examples/declarative/objectlistmodel/dataobject.h
index 6804474..852110d 100644
--- a/examples/declarative/objectlistmodel/dataobject.h
+++ b/examples/declarative/objectlistmodel/dataobject.h
@@ -48,8 +48,8 @@ class DataObject : public QObject
 {
     Q_OBJECT
 
-    Q_PROPERTY(QString name READ name WRITE setName)
-    Q_PROPERTY(QString color READ color WRITE setColor)
+    Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
+    Q_PROPERTY(QString color READ color WRITE setColor NOTIFY colorChanged)
 
 public:
     DataObject(QObject *parent=0);
@@ -61,6 +61,10 @@ public:
     QString color() const;
     void setColor(const QString &color);
 
+signals:
+    void nameChanged();
+    void colorChanged();
+
 private:
     QString m_name;
     QString m_color;
diff --git a/examples/declarative/objectlistmodel/view.qml b/examples/declarative/objectlistmodel/view.qml
index 908e388..2b8383f 100644
--- a/examples/declarative/objectlistmodel/view.qml
+++ b/examples/declarative/objectlistmodel/view.qml
@@ -9,7 +9,7 @@ ListView {
         Rectangle {
             height: 25
             width: 100
-            color: model.color
+            color: model.modelData.color
             Text { text: name }
         }
     }
diff --git a/src/declarative/QmlChanges.txt b/src/declarative/QmlChanges.txt
index 7218f78..dfc4244 100644
--- a/src/declarative/QmlChanges.txt
+++ b/src/declarative/QmlChanges.txt
@@ -4,6 +4,10 @@ The changes below are pre Qt 4.7.0 RC
 Flickable: overShoot is replaced by boundsBehavior enumeration.
 Component: isReady, isLoading, isError and isNull properties removed, use
     status property instead
+QList models no longer provide properties in model object.  The
+properties are now updated when the object changes.  An object's property
+"foo" may now be accessed as "foo", modelData.foo" or model.modelData.foo"
+
 
 C++ API
 -------
diff --git a/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp b/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp
index 2addc77..f01d4c2 100644
--- a/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp
+++ b/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp
@@ -437,8 +437,7 @@ int QDeclarativeVisualDataModelDataMetaObject::createProperty(const char *name,
     if ((!model->m_listModelInterface || !model->m_abstractItemModel) && model->m_listAccessor) {
         if (model->m_listAccessor->type() == QDeclarativeListAccessor::ListProperty) {
             model->ensureRoles();
-            QObject *object = model->m_listAccessor->at(data->m_index).value();
-            if (object && (object->property(name).isValid() || qstrcmp(name,"modelData")==0))
+            if (qstrcmp(name,"modelData") == 0)
                 return QDeclarativeOpenMetaObject::createProperty(name, type);
         }
     }
@@ -1029,6 +1028,11 @@ QDeclarativeItem *QDeclarativeVisualDataModel::item(int index, const QByteArray
         if (!ccontext) ccontext = qmlContext(this);
         QDeclarativeContext *ctxt = new QDeclarativeContext(ccontext);
         QDeclarativeVisualDataModelData *data = new QDeclarativeVisualDataModelData(index, this);
+        if ((!d->m_listModelInterface || !d->m_abstractItemModel) && d->m_listAccessor
+            && d->m_listAccessor->type() == QDeclarativeListAccessor::ListProperty) {
+            ctxt->setContextObject(d->m_listAccessor->at(index).value());
+            ctxt = new QDeclarativeContext(ctxt, ctxt);
+        }
         ctxt->setContextProperty(QLatin1String("model"), data);
         ctxt->setContextObject(data);
         d->m_completePending = false;
diff --git a/tests/auto/declarative/qdeclarativerepeater/data/objlist.qml b/tests/auto/declarative/qdeclarativerepeater/data/objlist.qml
index 17c5d8d..e1bd2e2 100644
--- a/tests/auto/declarative/qdeclarativerepeater/data/objlist.qml
+++ b/tests/auto/declarative/qdeclarativerepeater/data/objlist.qml
@@ -14,7 +14,7 @@ Rectangle {
         property int instantiated: 0
         Component {
             Item{
-                Component.onCompleted: {if(index!=model.idx) repeater.errors += 1; repeater.instantiated++}
+                Component.onCompleted: {if(index!=modelData.idx) repeater.errors += 1; repeater.instantiated++}
             }
         }
     }
diff --git a/tests/auto/declarative/qdeclarativerepeater/tst_qdeclarativerepeater.cpp b/tests/auto/declarative/qdeclarativerepeater/tst_qdeclarativerepeater.cpp
index 8be7d80..e6b2fdd 100644
--- a/tests/auto/declarative/qdeclarativerepeater/tst_qdeclarativerepeater.cpp
+++ b/tests/auto/declarative/qdeclarativerepeater/tst_qdeclarativerepeater.cpp
@@ -185,15 +185,24 @@ void tst_QDeclarativeRepeater::numberModel()
     delete canvas;
 }
 
+class MyObject : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(int idx READ idx CONSTANT)
+public:
+    MyObject(int i) : QObject(), m_idx(i) {}
+
+    int idx() const { return m_idx; }
+
+    int m_idx;
+};
+
 void tst_QDeclarativeRepeater::objectList()
 {
     QDeclarativeView *canvas = createView();
-
     QObjectList data;
-    for(int i=0; i<100; i++){
-        data << new QObject();
-        data.back()->setProperty("idx", i);
-    }
+    for(int i=0; i<100; i++)
+        data << new MyObject(i);
 
     QDeclarativeContext *ctxt = canvas->rootContext();
     ctxt->setContextProperty("testData", QVariant::fromValue(data));
-- 
cgit v0.12


From de5728c826d44808529a681472b899f30e18e325 Mon Sep 17 00:00:00 2001
From: Warwick Allison 
Date: Wed, 5 May 2010 14:51:11 +1000
Subject: doc

Task-number: QTBUG-10386
---
 .../graphicsitems/qdeclarativeborderimage.cpp      |  14 +--
 .../graphicsitems/qdeclarativeflickable.cpp        |  14 +--
 .../graphicsitems/qdeclarativeflipable.cpp         |   2 +-
 .../graphicsitems/qdeclarativegridview.cpp         |  18 ++--
 .../graphicsitems/qdeclarativeimage.cpp            |  20 ++--
 src/declarative/graphicsitems/qdeclarativeitem.cpp |   2 +-
 .../graphicsitems/qdeclarativelistview.cpp         |  18 ++--
 .../graphicsitems/qdeclarativeloader.cpp           |   8 +-
 .../graphicsitems/qdeclarativepathview.cpp         |   8 +-
 .../graphicsitems/qdeclarativepositioners.cpp      |  14 +--
 src/declarative/graphicsitems/qdeclarativetext.cpp |  73 +++++++------
 .../graphicsitems/qdeclarativetextedit.cpp         |  46 ++++-----
 .../graphicsitems/qdeclarativetextinput.cpp        |  28 ++---
 src/declarative/qml/qdeclarativecomponent.cpp      |   8 +-
 src/declarative/util/qdeclarativeanimation.cpp     | 114 ++++++++++-----------
 src/declarative/util/qdeclarativefontloader.cpp    |   8 +-
 .../util/qdeclarativesmoothedanimation.cpp         |   6 +-
 .../util/qdeclarativesmoothedfollow.cpp            |   6 +-
 src/declarative/util/qdeclarativexmllistmodel.cpp  |   8 +-
 19 files changed, 210 insertions(+), 205 deletions(-)

diff --git a/src/declarative/graphicsitems/qdeclarativeborderimage.cpp b/src/declarative/graphicsitems/qdeclarativeborderimage.cpp
index 14a2cab..018bd55 100644
--- a/src/declarative/graphicsitems/qdeclarativeborderimage.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeborderimage.cpp
@@ -102,10 +102,10 @@ QDeclarativeBorderImage::~QDeclarativeBorderImage()
 
     This property holds the status of image loading.  It can be one of:
     \list
-    \o Null - no image has been set
-    \o Ready - the image has been loaded
-    \o Loading - the image is currently being loaded
-    \o Error - an error occurred while loading the image
+    \o BorderImage.Null - no image has been set
+    \o BorderImage.Ready - the image has been loaded
+    \o BorderImage.Loading - the image is currently being loaded
+    \o BorderImage.Error - an error occurred while loading the image
     \endlist
 
     \sa progress
@@ -300,9 +300,9 @@ QDeclarativeScaleGrid *QDeclarativeBorderImage::border()
     This property describes how to repeat or stretch the middle parts of the border image.
 
     \list
-    \o Stretch - Scale the image to fit to the available area.
-    \o Repeat - Tile the image until there is no more space. May crop the last image.
-    \o Round - Like Repeat, but scales the images down to ensure that the last image is not cropped.
+    \o BorderImage.Stretch - Scale the image to fit to the available area.
+    \o BorderImage.Repeat - Tile the image until there is no more space. May crop the last image.
+    \o BorderImage.Round - Like Repeat, but scales the images down to ensure that the last image is not cropped.
     \endlist
 */
 QDeclarativeBorderImage::TileMode QDeclarativeBorderImage::horizontalTileMode() const
diff --git a/src/declarative/graphicsitems/qdeclarativeflickable.cpp b/src/declarative/graphicsitems/qdeclarativeflickable.cpp
index 35aa0f8..3128851 100644
--- a/src/declarative/graphicsitems/qdeclarativeflickable.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeflickable.cpp
@@ -587,13 +587,13 @@ QDeclarativeFlickableVisibleArea *QDeclarativeFlickable::visibleArea()
     This property determines which directions the view can be flicked.
 
     \list
-    \o AutoFlickDirection (default) - allows flicking vertically if the
+    \o Flickable.AutoFlickDirection (default) - allows flicking vertically if the
     \e contentHeight is not equal to the \e height of the Flickable.
     Allows flicking horizontally if the \e contentWidth is not equal
     to the \e width of the Flickable.
-    \o HorizontalFlick - allows flicking horizontally.
-    \o VerticalFlick - allows flicking vertically.
-    \o HorizontalAndVerticalFlick - allows flicking in both directions.
+    \o Flickable.HorizontalFlick - allows flicking horizontally.
+    \o Flickable.VerticalFlick - allows flicking vertically.
+    \o Flickable.HorizontalAndVerticalFlick - allows flicking in both directions.
     \endlist
 */
 QDeclarativeFlickable::FlickDirection QDeclarativeFlickable::flickDirection() const
@@ -1031,11 +1031,11 @@ void QDeclarativeFlickable::setOverShoot(bool o)
     The \c boundsBehavior can be one of:
 
     \list
-    \o \e StopAtBounds - the contents can not be dragged beyond the boundary
+    \o \e Flickable.StopAtBounds - the contents can not be dragged beyond the boundary
     of the flickable, and flicks will not overshoot.
-    \o \e DragOverBounds - the contents can be dragged beyond the boundary
+    \o \e Flickable.DragOverBounds - the contents can be dragged beyond the boundary
     of the Flickable, but flicks will not overshoot.
-    \o \e DragAndOvershootBounds (default) - the contents can be dragged
+    \o \e Flickable.DragAndOvershootBounds (default) - the contents can be dragged
     beyond the boundary of the Flickable, and can overshoot the
     boundary when flicked.
     \endlist
diff --git a/src/declarative/graphicsitems/qdeclarativeflipable.cpp b/src/declarative/graphicsitems/qdeclarativeflipable.cpp
index 85f40c3..e2fc809 100644
--- a/src/declarative/graphicsitems/qdeclarativeflipable.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeflipable.cpp
@@ -167,7 +167,7 @@ void QDeclarativeFlipable::retransformBack()
   \qmlproperty enumeration Flipable::side
 
   The side of the Flippable currently visible. Possible values are \c
-  Front and \c Back.
+  Flippable.Front and \c Flippable.Back.
 */
 QDeclarativeFlipable::Side QDeclarativeFlipable::side() const
 {
diff --git a/src/declarative/graphicsitems/qdeclarativegridview.cpp b/src/declarative/graphicsitems/qdeclarativegridview.cpp
index 8fb3632..f55c483 100644
--- a/src/declarative/graphicsitems/qdeclarativegridview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativegridview.cpp
@@ -1280,17 +1280,17 @@ void QDeclarativeGridView::setHighlightMoveDuration(int duration)
     highlight range. Furthermore, the behaviour of the current item index will occur
     whether or not a highlight exists.
 
-    If highlightRangeMode is set to \e ApplyRange the view will
+    If highlightRangeMode is set to \e GridView.ApplyRange the view will
     attempt to maintain the highlight within the range, however
     the highlight can move outside of the range at the ends of the list
     or due to a mouse interaction.
 
-    If highlightRangeMode is set to \e StrictlyEnforceRange the highlight will never
+    If highlightRangeMode is set to \e GridView.StrictlyEnforceRange the highlight will never
     move outside of the range.  This means that the current item will change
     if a keyboard or mouse action would cause the highlight to move
     outside of the range.
 
-    The default value is \e NoHighlightRange.
+    The default value is \e GridView.NoHighlightRange.
 
     Note that a valid range requires preferredHighlightEnd to be greater
     than or equal to preferredHighlightBegin.
@@ -1348,10 +1348,10 @@ void QDeclarativeGridView::setHighlightRangeMode(HighlightRangeMode mode)
   \qmlproperty enumeration GridView::flow
   This property holds the flow of the grid.
 
-  Possible values are \c LeftToRight (default) and \c TopToBottom.
+  Possible values are \c GridView.LeftToRight (default) and \c GridView.TopToBottom.
 
-  If \a flow is \c LeftToRight, the view will scroll vertically.
-  If \a flow is \c TopToBottom, the view will scroll horizontally.
+  If \a flow is \c GridView.LeftToRight, the view will scroll vertically.
+  If \a flow is \c GridView.TopToBottom, the view will scroll horizontally.
 */
 QDeclarativeGridView::Flow QDeclarativeGridView::flow() const
 {
@@ -1474,10 +1474,10 @@ void QDeclarativeGridView::setCellHeight(int cellHeight)
     The allowed values are:
 
     \list
-    \o NoSnap (default) - the view will stop anywhere within the visible area.
-    \o SnapToRow - the view will settle with a row (or column for TopToBottom flow)
+    \o GridView.NoSnap (default) - the view will stop anywhere within the visible area.
+    \o GridView.SnapToRow - the view will settle with a row (or column for TopToBottom flow)
     aligned with the start of the view.
-    \o SnapOneRow - the view will settle no more than one row (or column for TopToBottom flow)
+    \o GridView.SnapOneRow - the view will settle no more than one row (or column for TopToBottom flow)
     away from the first visible row at the time the mouse button is released.
     This mode is particularly useful for moving one page at a time.
     \endlist
diff --git a/src/declarative/graphicsitems/qdeclarativeimage.cpp b/src/declarative/graphicsitems/qdeclarativeimage.cpp
index 1c32b45..aeddb15 100644
--- a/src/declarative/graphicsitems/qdeclarativeimage.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeimage.cpp
@@ -199,12 +199,12 @@ void QDeclarativeImagePrivate::setPixmap(const QPixmap &pixmap)
     than the size of the item.
 
     \list
-    \o Stretch - the image is scaled to fit
-    \o PreserveAspectFit - the image is scaled uniformly to fit without cropping
-    \o PreserveAspectCrop - the image is scaled uniformly to fill, cropping if necessary
-    \o Tile - the image is duplicated horizontally and vertically
-    \o TileVertically - the image is stretched horizontally and tiled vertically
-    \o TileHorizontally - the image is stretched vertically and tiled horizontally
+    \o Image.Stretch - the image is scaled to fit
+    \o Image.PreserveAspectFit - the image is scaled uniformly to fit without cropping
+    \o Image.PreserveAspectCrop - the image is scaled uniformly to fill, cropping if necessary
+    \o Image.Tile - the image is duplicated horizontally and vertically
+    \o Image.TileVertically - the image is stretched horizontally and tiled vertically
+    \o Image.TileHorizontally - the image is stretched vertically and tiled horizontally
     \endlist
 
     \image declarative-image_fillMode.gif
@@ -243,10 +243,10 @@ qreal QDeclarativeImage::paintedHeight() const
 
     This property holds the status of image loading.  It can be one of:
     \list
-    \o Null - no image has been set
-    \o Ready - the image has been loaded
-    \o Loading - the image is currently being loaded
-    \o Error - an error occurred while loading the image
+    \o Image.Null - no image has been set
+    \o Image.Ready - the image has been loaded
+    \o Image.Loading - the image is currently being loaded
+    \o Image.Error - an error occurred while loading the image
     \endlist
 
     Note that a change in the status property does not cause anything to happen
diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp
index 14f6b4a..a0983cc 100644
--- a/src/declarative/graphicsitems/qdeclarativeitem.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp
@@ -1432,7 +1432,7 @@ QDeclarativeItem::~QDeclarativeItem()
     }
     \endqml
 
-    The default transform origin is \c Center.
+    The default transform origin is \c Item.Center.
 */
 
 /*!
diff --git a/src/declarative/graphicsitems/qdeclarativelistview.cpp b/src/declarative/graphicsitems/qdeclarativelistview.cpp
index 0f3ee61..3b77ff8 100644
--- a/src/declarative/graphicsitems/qdeclarativelistview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativelistview.cpp
@@ -1690,17 +1690,17 @@ void QDeclarativeListView::setHighlightFollowsCurrentItem(bool autoHighlight)
     highlight range. Furthermore, the behaviour of the current item index will occur
     whether or not a highlight exists.
 
-    If highlightRangeMode is set to \e ApplyRange the view will
+    If highlightRangeMode is set to \e ListView.ApplyRange the view will
     attempt to maintain the highlight within the range, however
     the highlight can move outside of the range at the ends of the list
     or due to a mouse interaction.
 
-    If highlightRangeMode is set to \e StrictlyEnforceRange the highlight will never
+    If highlightRangeMode is set to \e ListView.StrictlyEnforceRange the highlight will never
     move outside of the range.  This means that the current item will change
     if a keyboard or mouse action would cause the highlight to move
     outside of the range.
 
-    The default value is \e NoHighlightRange.
+    The default value is \e ListView.NoHighlightRange.
 
     Note that a valid range requires preferredHighlightEnd to be greater
     than or equal to preferredHighlightBegin.
@@ -1780,9 +1780,9 @@ void QDeclarativeListView::setSpacing(qreal spacing)
 
     Possible values are \c Vertical (default) and \c Horizontal.
 
-    Vertical Example:
+    ListView.Vertical Example:
     \image trivialListView.png
-    Horizontal Example:
+    ListView.Horizontal Example:
     \image ListViewHorizontal.png
 */
 QDeclarativeListView::Orientation QDeclarativeListView::orientation() const
@@ -1996,17 +1996,17 @@ void QDeclarativeListView::setHighlightResizeDuration(int duration)
     The allowed values are:
 
     \list
-    \o NoSnap (default) - the view will stop anywhere within the visible area.
-    \o SnapToItem - the view will settle with an item aligned with the start of
+    \o ListView.NoSnap (default) - the view will stop anywhere within the visible area.
+    \o ListView.SnapToItem - the view will settle with an item aligned with the start of
     the view.
-    \o SnapOneItem - the view will settle no more than one item away from the first
+    \o ListView.SnapOneItem - the view will settle no more than one item away from the first
     visible item at the time the mouse button is released.  This mode is particularly
     useful for moving one page at a time.
     \endlist
 
     snapMode does not affect the currentIndex.  To update the
     currentIndex as the list is moved set \e highlightRangeMode
-    to \e StrictlyEnforceRange.
+    to \e ListView.StrictlyEnforceRange.
 
     \sa highlightRangeMode
 */
diff --git a/src/declarative/graphicsitems/qdeclarativeloader.cpp b/src/declarative/graphicsitems/qdeclarativeloader.cpp
index 62fa4db..7edd53c 100644
--- a/src/declarative/graphicsitems/qdeclarativeloader.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeloader.cpp
@@ -329,10 +329,10 @@ void QDeclarativeLoaderPrivate::_q_sourceLoaded()
 
     This property holds the status of QML loading.  It can be one of:
     \list
-    \o Null - no QML source has been set
-    \o Ready - the QML source has been loaded
-    \o Loading - the QML source is currently being loaded
-    \o Error - an error occurred while loading the QML source
+    \o Loader.Null - no QML source has been set
+    \o Loader.Ready - the QML source has been loaded
+    \o Loader.Loading - the QML source is currently being loaded
+    \o Loader.Error - an error occurred while loading the QML source
     \endlist
 
     Note that a change in the status property does not cause anything to happen
diff --git a/src/declarative/graphicsitems/qdeclarativepathview.cpp b/src/declarative/graphicsitems/qdeclarativepathview.cpp
index 7cb723c..9ae6f9d 100644
--- a/src/declarative/graphicsitems/qdeclarativepathview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativepathview.cpp
@@ -618,12 +618,12 @@ QDeclarativeItem *QDeclarativePathView::highlightItem()
     These properties set the preferred range of the highlight (current item)
     within the view.  The preferred values must be in the range 0.0-1.0.
 
-    If highlightRangeMode is set to \e ApplyRange the view will
+    If highlightRangeMode is set to \e PathView.ApplyRange the view will
     attempt to maintain the highlight within the range, however
     the highlight can move outside of the range at the ends of the path
     or due to a mouse interaction.
 
-    If highlightRangeMode is set to \e StrictlyEnforceRange the highlight will never
+    If highlightRangeMode is set to \e PathView.StrictlyEnforceRange the highlight will never
     move outside of the range.  This means that the current item will change
     if a keyboard or mouse action would cause the highlight to move
     outside of the range.
@@ -631,14 +631,14 @@ QDeclarativeItem *QDeclarativePathView::highlightItem()
     Note that this is the correct way to influence where the
     current item ends up when the view moves. For example, if you want the
     currently selected item to be in the middle of the path, then set the
-    highlight range to be 0.5,0.5 and highlightRangeMode to StrictlyEnforceRange.
+    highlight range to be 0.5,0.5 and highlightRangeMode to PathView.StrictlyEnforceRange.
     Then, when the path scrolls,
     the currently selected item will be the item at that position. This also applies to
     when the currently selected item changes - it will scroll to within the preferred
     highlight range. Furthermore, the behaviour of the current item index will occur
     whether or not a highlight exists.
 
-    The default value is \e StrictlyEnforceRange.
+    The default value is \e PathView.StrictlyEnforceRange.
 
     Note that a valid range requires preferredHighlightEnd to be greater
     than or equal to preferredHighlightBegin.
diff --git a/src/declarative/graphicsitems/qdeclarativepositioners.cpp b/src/declarative/graphicsitems/qdeclarativepositioners.cpp
index 7e4549f..206b09d 100644
--- a/src/declarative/graphicsitems/qdeclarativepositioners.cpp
+++ b/src/declarative/graphicsitems/qdeclarativepositioners.cpp
@@ -738,14 +738,14 @@ void QDeclarativeGrid::setRows(const int rows)
 }
 
 /*!
-    \qmlproperty enumeration Flow::flow
+    \qmlproperty enumeration Grid::flow
     This property holds the flow of the layout.
 
-    Possible values are \c LeftToRight (default) and \c TopToBottom.
+    Possible values are \c Grid.LeftToRight (default) and \c Grid.TopToBottom.
 
-    If \a flow is \c LeftToRight, the items are positioned next to
+    If \a flow is \c Grid.LeftToRight, the items are positioned next to
     to each other from left to right, then wrapped to the next line.
-    If \a flow is \c TopToBottom, the items are positioned next to each
+    If \a flow is \c Grid.TopToBottom, the items are positioned next to each
     other from top to bottom, then wrapped to the next column.
 */
 QDeclarativeGrid::Flow QDeclarativeGrid::flow() const
@@ -952,12 +952,12 @@ QDeclarativeFlow::QDeclarativeFlow(QDeclarativeItem *parent)
     \qmlproperty enumeration Flow::flow
     This property holds the flow of the layout.
 
-    Possible values are \c LeftToRight (default) and \c TopToBottom.
+    Possible values are \c Flow.LeftToRight (default) and \c Flow.TopToBottom.
 
-    If \a flow is \c LeftToRight, the items are positioned next to
+    If \a flow is \c Flow.LeftToRight, the items are positioned next to
     to each other from left to right until the width of the Flow
     is exceeded, then wrapped to the next line.
-    If \a flow is \c TopToBottom, the items are positioned next to each
+    If \a flow is \c Flow.TopToBottom, the items are positioned next to each
     other from top to bottom until the height of the Flow is exceeded,
     then wrapped to the next column.
 */
diff --git a/src/declarative/graphicsitems/qdeclarativetext.cpp b/src/declarative/graphicsitems/qdeclarativetext.cpp
index eeff0c3..4e7e0fd 100644
--- a/src/declarative/graphicsitems/qdeclarativetext.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetext.cpp
@@ -200,11 +200,11 @@ QDeclarativeTextPrivate::~QDeclarativeTextPrivate()
 
     The weight can be one of:
     \list
-    \o Light
-    \o Normal - the default
-    \o DemiBold
-    \o Bold
-    \o Black
+    \o Font.Light
+    \o Font.Normal - the default
+    \o Font.DemiBold
+    \o Font.Bold
+    \o Font.Black
     \endlist
 
     \qml
@@ -277,11 +277,11 @@ QDeclarativeTextPrivate::~QDeclarativeTextPrivate()
     Sets the capitalization for the text.
 
     \list
-    \o MixedCase - This is the normal text rendering option where no capitalization change is applied.
-    \o AllUppercase - This alters the text to be rendered in all uppercase type.
-    \o AllLowercase	 - This alters the text to be rendered in all lowercase type.
-    \o SmallCaps -	This alters the text to be rendered in small-caps type.
-    \o Capitalize - This alters the text to be rendered with the first character of each word as an uppercase character.
+    \o Font.MixedCase - This is the normal text rendering option where no capitalization change is applied.
+    \o Font.AllUppercase - This alters the text to be rendered in all uppercase type.
+    \o Font.AllLowercase	 - This alters the text to be rendered in all lowercase type.
+    \o Font.SmallCaps -	This alters the text to be rendered in small-caps type.
+    \o Font.Capitalize - This alters the text to be rendered with the first character of each word as an uppercase character.
     \endlist
 
     \qml
@@ -380,10 +380,10 @@ QColor QDeclarativeText::color() const
 
     Supported text styles are:
     \list
-    \o Normal - the default
-    \o Outline
-    \o Raised
-    \o Sunken
+    \o Text.Normal - the default
+    \o Text.Outline
+    \o Text.Raised
+    \o Text.Sunken
     \endlist
 
     \qml
@@ -451,9 +451,14 @@ QColor QDeclarativeText::styleColor() const
     Sets the horizontal and vertical alignment of the text within the Text items
     width and height.  By default, the text is top-left aligned.
 
-    The valid values for \c horizontalAlignment are \c AlignLeft, \c AlignRight and
-    \c AlignHCenter.  The valid values for \c verticalAlignment are \c AlignTop, \c AlignBottom
-    and \c AlignVCenter.
+    The valid values for \c horizontalAlignment are \c Text.AlignLeft, \c Text.AlignRight and
+    \c Text.AlignHCenter.  The valid values for \c verticalAlignment are \c Text.AlignTop, \c Text.AlignBottom
+    and \c Text.AlignVCenter.
+
+    Note that for a single line of text, the size of the text is the area of the text. In this common case,
+    all alignments are equivalent. If you want the text to be, say, centered in it parent, then you will
+    need to either modify the Item::anchors, or set horizontalAlignment to Text.AlignHCenter and bind the width to 
+    that of the parent.
 */
 QDeclarativeText::HAlignment QDeclarativeText::hAlign() const
 {
@@ -494,16 +499,16 @@ void QDeclarativeText::setVAlign(VAlignment align)
     wrap if an explicit width has been set.  wrapMode can be one of:
 
     \list
-    \o NoWrap - no wrapping will be performed.
-    \o WordWrap - wrapping is done on word boundaries. If the text cannot be
+    \o Text.NoWrap - no wrapping will be performed.
+    \o Text.WordWrap - wrapping is done on word boundaries. If the text cannot be
     word-wrapped to the specified width it will be partially drawn outside of the item's bounds.
     If this is undesirable then enable clipping on the item (Item::clip).
-    \o WrapAnywhere - Text can be wrapped at any point on a line, even if it occurs in the middle of a word.
-    \o WrapAtWordBoundaryOrAnywhere - If possible, wrapping occurs at a word boundary; otherwise it
+    \o Text.WrapAnywhere - Text can be wrapped at any point on a line, even if it occurs in the middle of a word.
+    \o Text.WrapAtWordBoundaryOrAnywhere - If possible, wrapping occurs at a word boundary; otherwise it
        will occur at the appropriate point on the line, even in the middle of a word.
     \endlist
 
-    The default is NoWrap.
+    The default is Text.NoWrap.
 */
 QDeclarativeText::WrapMode QDeclarativeText::wrapMode() const
 {
@@ -533,17 +538,17 @@ void QDeclarativeText::setWrapMode(WrapMode mode)
     Supported text formats are:
     
     \list
-    \o AutoText
-    \o PlainText
-    \o RichText
-    \o StyledText
+    \o Text.AutoText
+    \o Text.PlainText
+    \o Text.RichText
+    \o Text.StyledText
     \endlist
 
-    The default is AutoText.  If the text format is AutoText the text element
+    The default is Text.AutoText.  If the text format is Text.AutoText the text element
     will automatically determine whether the text should be treated as
     rich text.  This determination is made using Qt::mightBeRichText().
 
-    StyledText is an optimized format supporting some basic text
+    Text.StyledText is an optimized format supporting some basic text
     styling markup, in the style of html 3.2:
 
     \code
@@ -554,7 +559,7 @@ void QDeclarativeText::setWrapMode(WrapMode mode)
     > < &
     \endcode
 
-    \c StyledText parser is strict, requiring tags to be correctly nested.
+    \c Text.StyledText parser is strict, requiring tags to be correctly nested.
 
     \table
     \row
@@ -622,13 +627,13 @@ void QDeclarativeText::setTextFormat(TextFormat format)
 
     Eliding can be:
     \list
-    \o ElideNone  - the default
-    \o ElideLeft
-    \o ElideMiddle
-    \o ElideRight
+    \o Text.ElideNone  - the default
+    \o Text.ElideLeft
+    \o Text.ElideMiddle
+    \o Text.ElideRight
     \endlist
 
-    If the text is a multi-length string, and the mode is not \c ElideNone,
+    If the text is a multi-length string, and the mode is not \c Text.ElideNone,
     the first string that fits will be used, otherwise the last will be elided.
 
     Multi-length strings are ordered from longest to shortest, separated by the
diff --git a/src/declarative/graphicsitems/qdeclarativetextedit.cpp b/src/declarative/graphicsitems/qdeclarativetextedit.cpp
index 762640c..d0ee2ee 100644
--- a/src/declarative/graphicsitems/qdeclarativetextedit.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextedit.cpp
@@ -138,11 +138,11 @@ QString QDeclarativeTextEdit::text() const
 
     The weight can be one of:
     \list
-    \o Light
-    \o Normal - the default
-    \o DemiBold
-    \o Bold
-    \o Black
+    \o Font.Light
+    \o Font.Normal - the default
+    \o Font.DemiBold
+    \o Font.Bold
+    \o Font.Black
     \endlist
 
     \qml
@@ -215,11 +215,11 @@ QString QDeclarativeTextEdit::text() const
     Sets the capitalization for the text.
 
     \list
-    \o MixedCase - This is the normal text rendering option where no capitalization change is applied.
-    \o AllUppercase - This alters the text to be rendered in all uppercase type.
-    \o AllLowercase	 - This alters the text to be rendered in all lowercase type.
-    \o SmallCaps -	This alters the text to be rendered in small-caps type.
-    \o Capitalize - This alters the text to be rendered with the first character of each word as an uppercase character.
+    \o Font.MixedCase - This is the normal text rendering option where no capitalization change is applied.
+    \o Font.AllUppercase - This alters the text to be rendered in all uppercase type.
+    \o Font.AllLowercase	 - This alters the text to be rendered in all lowercase type.
+    \o Font.SmallCaps -	This alters the text to be rendered in small-caps type.
+    \o Font.Capitalize - This alters the text to be rendered with the first character of each word as an uppercase character.
     \endlist
 
     \qml
@@ -255,13 +255,13 @@ void QDeclarativeTextEdit::setText(const QString &text)
     The way the text property should be displayed.
 
     \list
-    \o AutoText
-    \o PlainText
-    \o RichText
-    \o StyledText
+    \o TextEdit.AutoText
+    \o TextEdit.PlainText
+    \o TextEdit.RichText
+    \o TextEdit.StyledText
     \endlist
 
-    The default is AutoText.  If the text format is AutoText the text edit
+    The default is TextEdit.AutoText.  If the text format is TextEdit.AutoText the text edit
     will automatically determine whether the text should be treated as
     rich text.  This determination is made using Qt::mightBeRichText().
 
@@ -428,9 +428,9 @@ void QDeclarativeTextEdit::setSelectedTextColor(const QColor &color)
     Sets the horizontal and vertical alignment of the text within the TextEdit items
     width and height.  By default, the text is top-left aligned.
 
-    The valid values for \c horizontalAlignment are \c AlignLeft, \c AlignRight and
-    \c AlignHCenter.  The valid values for \c verticalAlignment are \c AlignTop, \c AlignBottom
-    and \c AlignVCenter.
+    The valid values for \c horizontalAlignment are \c TextEdit.AlignLeft, \c TextEdit.AlignRight and
+    \c TextEdit.AlignHCenter.  The valid values for \c verticalAlignment are \c TextEdit.AlignTop, \c TextEdit.AlignBottom
+    and \c TextEdit.AlignVCenter.
 */
 QDeclarativeTextEdit::HAlignment QDeclarativeTextEdit::hAlign() const
 {
@@ -473,14 +473,14 @@ void QDeclarativeTextEdit::setVAlign(QDeclarativeTextEdit::VAlignment alignment)
     The text will only wrap if an explicit width has been set.
 
     \list
-    \o NoWrap - no wrapping will be performed.
-    \o WordWrap - wrapping is done on word boundaries.
-    \o WrapAnywhere - Text can be wrapped at any point on a line, even if it occurs in the middle of a word.
-    \o WrapAtWordBoundaryOrAnywhere - If possible, wrapping occurs at a word boundary; otherwise it
+    \o TextEdit.NoWrap - no wrapping will be performed.
+    \o TextEdit.WordWrap - wrapping is done on word boundaries.
+    \o TextEdit.WrapAnywhere - Text can be wrapped at any point on a line, even if it occurs in the middle of a word.
+    \o TextEdit.WrapAtWordBoundaryOrAnywhere - If possible, wrapping occurs at a word boundary; otherwise it
        will occur at the appropriate point on the line, even in the middle of a word.
     \endlist
 
-    The default is NoWrap.
+    The default is TextEdit.NoWrap.
 */
 QDeclarativeTextEdit::WrapMode QDeclarativeTextEdit::wrapMode() const
 {
diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
index 775450a..b04e36e 100644
--- a/src/declarative/graphicsitems/qdeclarativetextinput.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
@@ -118,11 +118,11 @@ void QDeclarativeTextInput::setText(const QString &s)
 
     The weight can be one of:
     \list
-    \o Light
-    \o Normal - the default
-    \o DemiBold
-    \o Bold
-    \o Black
+    \o Font.Light
+    \o Font.Normal - the default
+    \o Font.DemiBold
+    \o Font.Bold
+    \o Font.Black
     \endlist
 
     \qml
@@ -195,11 +195,11 @@ void QDeclarativeTextInput::setText(const QString &s)
     Sets the capitalization for the text.
 
     \list
-    \o MixedCase - This is the normal text rendering option where no capitalization change is applied.
-    \o AllUppercase - This alters the text to be rendered in all uppercase type.
-    \o AllLowercase	 - This alters the text to be rendered in all lowercase type.
-    \o SmallCaps -	This alters the text to be rendered in small-caps type.
-    \o Capitalize - This alters the text to be rendered with the first character of each word as an uppercase character.
+    \o Font.MixedCase - This is the normal text rendering option where no capitalization change is applied.
+    \o Font.AllUppercase - This alters the text to be rendered in all uppercase type.
+    \o Font.AllLowercase	 - This alters the text to be rendered in all lowercase type.
+    \o Font.SmallCaps -	This alters the text to be rendered in small-caps type.
+    \o Font.Capitalize - This alters the text to be rendered with the first character of each word as an uppercase character.
     \endlist
 
     \qml
@@ -308,8 +308,8 @@ void QDeclarativeTextInput::setSelectedTextColor(const QColor &color)
     vertically. You can use anchors to align it however you want within
     another item.
 
-    The valid values for \c horizontalAlignment are \c AlignLeft, \c AlignRight and
-    \c AlignHCenter.
+    The valid values for \c horizontalAlignment are \c TextInput.AlignLeft, \c TextInput.AlignRight and
+    \c TextInput.AlignHCenter.
 */
 QDeclarativeTextInput::HAlignment QDeclarativeTextInput::hAlign() const
 {
@@ -600,9 +600,9 @@ void QDeclarativeTextInput::setAutoScroll(bool b)
     This property holds the notation of how a string can describe a number.
 
     The values for this property are DoubleValidator.StandardNotation or DoubleValidator.ScientificNotation.
-    If this property is set to ScientificNotation, the written number may have an exponent part(i.e. 1.5E-2).
+    If this property is set to DoubleValidator.ScientificNotation, the written number may have an exponent part(i.e. 1.5E-2).
 
-    By default, this property is set to ScientificNotation.
+    By default, this property is set to DoubleValidator.ScientificNotation.
 */
 
 /*!
diff --git a/src/declarative/qml/qdeclarativecomponent.cpp b/src/declarative/qml/qdeclarativecomponent.cpp
index 3ca0707..fb799dc 100644
--- a/src/declarative/qml/qdeclarativecomponent.cpp
+++ b/src/declarative/qml/qdeclarativecomponent.cpp
@@ -241,10 +241,10 @@ QDeclarativeComponent::~QDeclarativeComponent()
     \qmlproperty enumeration Component::status
     This property holds the status of component loading.  It can be one of:
     \list
-    \o Null - no data is available for the component
-    \o Ready - the component has been loaded, and can be used to create instances.
-    \o Loading - the component is currently being loaded
-    \o Error - an error occurred while loading the component.
+    \o Component.Null - no data is available for the component
+    \o Component.Ready - the component has been loaded, and can be used to create instances.
+    \o Component.Loading - the component is currently being loaded
+    \o Component.Error - an error occurred while loading the component.
                Calling errorsString() will provide a human-readable description of any errors.
     \endlist
  */
diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp
index 4059522..067565d 100644
--- a/src/declarative/util/qdeclarativeanimation.cpp
+++ b/src/declarative/util/qdeclarativeanimation.cpp
@@ -1320,27 +1320,27 @@ void QDeclarativeRotationAnimation::setTo(qreal t)
 /*!
     \qmlproperty enumeration RotationAnimation::direction
     The direction in which to rotate.
-    Possible values are Numerical, Clockwise, Counterclockwise,
-    or Shortest.
+
+    Possible values are:
 
     \table
     \row
-        \o Numerical
+        \o RotationAnimation.Numerical
         \o Rotate by linearly interpolating between the two numbers.
            A rotation from 10 to 350 will rotate 340 degrees clockwise.
     \row
-        \o Clockwise
+        \o RotationAnimation.Clockwise
         \o Rotate clockwise between the two values
     \row
-        \o Counterclockwise
+        \o RotationAnimation.Counterclockwise
         \o Rotate counterclockwise between the two values
     \row
-        \o Shortest
+        \o RotationAnimation.Shortest
         \o Rotate in the direction that produces the shortest animation path.
            A rotation from 10 to 350 will rotate 20 degrees counterclockwise.
     \endtable
 
-    The default direction is Numerical.
+    The default direction is RotationAnimation.Numerical.
 */
 QDeclarativeRotationAnimation::RotationDirection QDeclarativeRotationAnimation::direction() const
 {
@@ -1754,189 +1754,189 @@ void QDeclarativePropertyAnimation::setTo(const QVariant &t)
     Linear.
 
     \qml
-    PropertyAnimation { properties: "y"; easing.type: "InOutElastic"; easing.amplitude: 2.0; easing.period: 1.5 }
+    PropertyAnimation { properties: "y"; easing.type: Easing.InOutElastic; easing.amplitude: 2.0; easing.period: 1.5 }
     \endqml
 
     Available types are:
 
     \table
     \row
-        \o \c Linear
+        \o \c Easing.Linear
         \o Easing curve for a linear (t) function: velocity is constant.
         \o \inlineimage qeasingcurve-linear.png
     \row
-        \o \c InQuad
+        \o \c Easing.InQuad
         \o Easing curve for a quadratic (t^2) function: accelerating from zero velocity.
         \o \inlineimage qeasingcurve-inquad.png
     \row
-        \o \c OutQuad
+        \o \c Easing.OutQuad
         \o Easing curve for a quadratic (t^2) function: decelerating to zero velocity.
         \o \inlineimage qeasingcurve-outquad.png
     \row
-        \o \c InOutQuad
+        \o \c Easing.InOutQuad
         \o Easing curve for a quadratic (t^2) function: acceleration until halfway, then deceleration.
         \o \inlineimage qeasingcurve-inoutquad.png
     \row
-        \o \c OutInQuad
+        \o \c Easing.OutInQuad
         \o Easing curve for a quadratic (t^2) function: deceleration until halfway, then acceleration.
         \o \inlineimage qeasingcurve-outinquad.png
     \row
-        \o \c InCubic
+        \o \c Easing.InCubic
         \o Easing curve for a cubic (t^3) function: accelerating from zero velocity.
         \o \inlineimage qeasingcurve-incubic.png
     \row
-        \o \c OutCubic
+        \o \c Easing.OutCubic
         \o Easing curve for a cubic (t^3) function: decelerating from zero velocity.
         \o \inlineimage qeasingcurve-outcubic.png
     \row
-        \o \c InOutCubic
+        \o \c Easing.InOutCubic
         \o Easing curve for a cubic (t^3) function: acceleration until halfway, then deceleration.
         \o \inlineimage qeasingcurve-inoutcubic.png
     \row
-        \o \c OutInCubic
+        \o \c Easing.OutInCubic
         \o Easing curve for a cubic (t^3) function: deceleration until halfway, then acceleration.
         \o \inlineimage qeasingcurve-outincubic.png
     \row
-        \o \c InQuart
+        \o \c Easing.InQuart
         \o Easing curve for a quartic (t^4) function: accelerating from zero velocity.
         \o \inlineimage qeasingcurve-inquart.png
     \row
-        \o \c OutQuart
+        \o \c Easing.OutQuart
         \o Easing curve for a cubic (t^4) function: decelerating from zero velocity.
         \o \inlineimage qeasingcurve-outquart.png
     \row
-        \o \c InOutQuart
+        \o \c Easing.InOutQuart
         \o Easing curve for a cubic (t^4) function: acceleration until halfway, then deceleration.
         \o \inlineimage qeasingcurve-inoutquart.png
     \row
-        \o \c OutInQuart
+        \o \c Easing.OutInQuart
         \o Easing curve for a cubic (t^4) function: deceleration until halfway, then acceleration.
         \o \inlineimage qeasingcurve-outinquart.png
     \row
-        \o \c InQuint
+        \o \c Easing.InQuint
         \o Easing curve for a quintic (t^5) function: accelerating from zero velocity.
         \o \inlineimage qeasingcurve-inquint.png
     \row
-        \o \c OutQuint
+        \o \c Easing.OutQuint
         \o Easing curve for a cubic (t^5) function: decelerating from zero velocity.
         \o \inlineimage qeasingcurve-outquint.png
     \row
-        \o \c InOutQuint
+        \o \c Easing.InOutQuint
         \o Easing curve for a cubic (t^5) function: acceleration until halfway, then deceleration.
         \o \inlineimage qeasingcurve-inoutquint.png
     \row
-        \o \c OutInQuint
+        \o \c Easing.OutInQuint
         \o Easing curve for a cubic (t^5) function: deceleration until halfway, then acceleration.
         \o \inlineimage qeasingcurve-outinquint.png
     \row
-        \o \c InSine
+        \o \c Easing.InSine
         \o Easing curve for a sinusoidal (sin(t)) function: accelerating from zero velocity.
         \o \inlineimage qeasingcurve-insine.png
     \row
-        \o \c OutSine
+        \o \c Easing.OutSine
         \o Easing curve for a sinusoidal (sin(t)) function: decelerating from zero velocity.
         \o \inlineimage qeasingcurve-outsine.png
     \row
-        \o \c InOutSine
+        \o \c Easing.InOutSine
         \o Easing curve for a sinusoidal (sin(t)) function: acceleration until halfway, then deceleration.
         \o \inlineimage qeasingcurve-inoutsine.png
     \row
-        \o \c OutInSine
+        \o \c Easing.OutInSine
         \o Easing curve for a sinusoidal (sin(t)) function: deceleration until halfway, then acceleration.
         \o \inlineimage qeasingcurve-outinsine.png
     \row
-        \o \c InExpo
+        \o \c Easing.InExpo
         \o Easing curve for an exponential (2^t) function: accelerating from zero velocity.
         \o \inlineimage qeasingcurve-inexpo.png
     \row
-        \o \c OutExpo
+        \o \c Easing.OutExpo
         \o Easing curve for an exponential (2^t) function: decelerating from zero velocity.
         \o \inlineimage qeasingcurve-outexpo.png
     \row
-        \o \c InOutExpo
+        \o \c Easing.InOutExpo
         \o Easing curve for an exponential (2^t) function: acceleration until halfway, then deceleration.
         \o \inlineimage qeasingcurve-inoutexpo.png
     \row
-        \o \c OutInExpo
+        \o \c Easing.OutInExpo
         \o Easing curve for an exponential (2^t) function: deceleration until halfway, then acceleration.
         \o \inlineimage qeasingcurve-outinexpo.png
     \row
-        \o \c InCirc
+        \o \c Easing.InCirc
         \o Easing curve for a circular (sqrt(1-t^2)) function: accelerating from zero velocity.
         \o \inlineimage qeasingcurve-incirc.png
     \row
-        \o \c OutCirc
+        \o \c Easing.OutCirc
         \o Easing curve for a circular (sqrt(1-t^2)) function: decelerating from zero velocity.
         \o \inlineimage qeasingcurve-outcirc.png
     \row
-        \o \c InOutCirc
+        \o \c Easing.InOutCirc
         \o Easing curve for a circular (sqrt(1-t^2)) function: acceleration until halfway, then deceleration.
         \o \inlineimage qeasingcurve-inoutcirc.png
     \row
-        \o \c OutInCirc
+        \o \c Easing.OutInCirc
         \o Easing curve for a circular (sqrt(1-t^2)) function: deceleration until halfway, then acceleration.
         \o \inlineimage qeasingcurve-outincirc.png
     \row
-        \o \c InElastic
+        \o \c Easing.InElastic
         \o Easing curve for an elastic (exponentially decaying sine wave) function: accelerating from zero velocity.
         \br The peak amplitude can be set with the \e amplitude parameter, and the period of decay by the \e period parameter.
         \o \inlineimage qeasingcurve-inelastic.png
     \row
-        \o \c OutElastic
+        \o \c Easing.OutElastic
         \o Easing curve for an elastic (exponentially decaying sine wave) function: decelerating from zero velocity.
         \br The peak amplitude can be set with the \e amplitude parameter, and the period of decay by the \e period parameter.
         \o \inlineimage qeasingcurve-outelastic.png
     \row
-        \o \c InOutElastic
+        \o \c Easing.InOutElastic
         \o Easing curve for an elastic (exponentially decaying sine wave) function: acceleration until halfway, then deceleration.
         \o \inlineimage qeasingcurve-inoutelastic.png
     \row
-        \o \c OutInElastic
+        \o \c Easing.OutInElastic
         \o Easing curve for an elastic (exponentially decaying sine wave) function: deceleration until halfway, then acceleration.
         \o \inlineimage qeasingcurve-outinelastic.png
     \row
-        \o \c InBack
+        \o \c Easing.InBack
         \o Easing curve for a back (overshooting cubic function: (s+1)*t^3 - s*t^2) easing in: accelerating from zero velocity.
         \o \inlineimage qeasingcurve-inback.png
     \row
-        \o \c OutBack
+        \o \c Easing.OutBack
         \o Easing curve for a back (overshooting cubic function: (s+1)*t^3 - s*t^2) easing out: decelerating to zero velocity.
         \o \inlineimage qeasingcurve-outback.png
     \row
-        \o \c InOutBack
+        \o \c Easing.InOutBack
         \o Easing curve for a back (overshooting cubic function: (s+1)*t^3 - s*t^2) easing in/out: acceleration until halfway, then deceleration.
         \o \inlineimage qeasingcurve-inoutback.png
     \row
-        \o \c OutInBack
+        \o \c Easing.OutInBack
         \o Easing curve for a back (overshooting cubic easing: (s+1)*t^3 - s*t^2) easing out/in: deceleration until halfway, then acceleration.
         \o \inlineimage qeasingcurve-outinback.png
     \row
-        \o \c InBounce
+        \o \c Easing.InBounce
         \o Easing curve for a bounce (exponentially decaying parabolic bounce) function: accelerating from zero velocity.
         \o \inlineimage qeasingcurve-inbounce.png
     \row
-        \o \c OutBounce
+        \o \c Easing.OutBounce
         \o Easing curve for a bounce (exponentially decaying parabolic bounce) function: decelerating from zero velocity.
         \o \inlineimage qeasingcurve-outbounce.png
     \row
-        \o \c InOutBounce
+        \o \c Easing.InOutBounce
         \o Easing curve for a bounce (exponentially decaying parabolic bounce) function easing in/out: acceleration until halfway, then deceleration.
         \o \inlineimage qeasingcurve-inoutbounce.png
     \row
-        \o \c OutInBounce
+        \o \c Easing.OutInBounce
         \o Easing curve for a bounce (exponentially decaying parabolic bounce) function easing out/in: deceleration until halfway, then acceleration.
         \o \inlineimage qeasingcurve-outinbounce.png
     \endtable
 
-    easing.amplitude is not applicable for all curve types. It is only applicable for bounce and elastic curves (curves of type
-    QEasingCurve::InBounce, QEasingCurve::OutBounce, QEasingCurve::InOutBounce, QEasingCurve::OutInBounce, QEasingCurve::InElastic,
-    QEasingCurve::OutElastic, QEasingCurve::InOutElastic or QEasingCurve::OutInElastic).
+    easing.amplitude is only applicable for bounce and elastic curves (curves of type
+    Easing.InBounce, Easing.OutBounce, Easing.InOutBounce, Easing.OutInBounce, Easing.InElastic,
+    Easing.OutElastic, Easing.InOutElastic or Easing.OutInElastic).
 
-    easing.overshoot is not applicable for all curve types. It is only applicable if type is: QEasingCurve::InBack, QEasingCurve::OutBack,
-    QEasingCurve::InOutBack or QEasingCurve::OutInBack.
+    easing.overshoot is only applicable if type is: Easing.InBack, Easing.OutBack,
+    Easing.InOutBack or Easing.OutInBack.
 
-    easing.period is not applicable for all curve types. It is only applicable if type is: QEasingCurve::InElastic, QEasingCurve::OutElastic,
-    QEasingCurve::InOutElastic or QEasingCurve::OutInElastic.
+    easing.period is only applicable if type is: Easing.InElastic, Easing.OutElastic,
+    Easing.InOutElastic or Easing.OutInElastic.
 */
 QEasingCurve QDeclarativePropertyAnimation::easing() const
 {
@@ -2730,7 +2730,7 @@ void QDeclarativeAnchorAnimation::setDuration(int duration)
     Linear.
 
     \qml
-    AnchorAnimation { easing.type: "InOutQuad" }
+    AnchorAnimation { easing.type: Easing.InOutQuad }
     \endqml
 
     See the \l{PropertyAnimation::easing.type} documentation for information
diff --git a/src/declarative/util/qdeclarativefontloader.cpp b/src/declarative/util/qdeclarativefontloader.cpp
index f98ce8b..adfcd62 100644
--- a/src/declarative/util/qdeclarativefontloader.cpp
+++ b/src/declarative/util/qdeclarativefontloader.cpp
@@ -185,10 +185,10 @@ void QDeclarativeFontLoader::setName(const QString &name)
 
     This property holds the status of font loading.  It can be one of:
     \list
-    \o Null - no font has been set
-    \o Ready - the font has been loaded
-    \o Loading - the font is currently being loaded
-    \o Error - an error occurred while loading the font
+    \o FontLoader.Null - no font has been set
+    \o FontLoader.Ready - the font has been loaded
+    \o FontLoader.Loading - the font is currently being loaded
+    \o FontLoader.Error - an error occurred while loading the font
     \endlist
 
     Note that a change in the status property does not cause anything to happen
diff --git a/src/declarative/util/qdeclarativesmoothedanimation.cpp b/src/declarative/util/qdeclarativesmoothedanimation.cpp
index 19a00ee..bd48ef0 100644
--- a/src/declarative/util/qdeclarativesmoothedanimation.cpp
+++ b/src/declarative/util/qdeclarativesmoothedanimation.cpp
@@ -388,10 +388,10 @@ void QDeclarativeSmoothedAnimation::transition(QDeclarativeStateActions &actions
 
     Sets how the SmoothedAnimation behaves if an animation direction is reversed.
 
-    If reversing mode is \c Eased, the animation will smoothly decelerate, and
-    then reverse direction.  If the reversing mode is \c Immediate, the
+    If reversing mode is \c SmoothedAnimation.Eased, the animation will smoothly decelerate, and
+    then reverse direction.  If the reversing mode is \c SmoothedAnimation.Immediate, the
     animation will immediately begin accelerating in the reverse direction,
-    begining with a velocity of 0.  If the reversing mode is \c Sync, the
+    begining with a velocity of 0.  If the reversing mode is \c SmoothedAnimation.Sync, the
     property is immediately set to the target value.
 */
 QDeclarativeSmoothedAnimation::ReversingMode QDeclarativeSmoothedAnimation::reversingMode() const
diff --git a/src/declarative/util/qdeclarativesmoothedfollow.cpp b/src/declarative/util/qdeclarativesmoothedfollow.cpp
index 3ed9257..e919282 100644
--- a/src/declarative/util/qdeclarativesmoothedfollow.cpp
+++ b/src/declarative/util/qdeclarativesmoothedfollow.cpp
@@ -143,10 +143,10 @@ QDeclarativeSmoothedFollowPrivate::QDeclarativeSmoothedFollowPrivate()
 
     Sets how the SmoothedFollow behaves if an animation direction is reversed.
 
-    If reversing mode is \c Eased, the animation will smoothly decelerate, and
-    then reverse direction.  If the reversing mode is \c Immediate, the
+    If reversing mode is \SmoothedFollow.c Eased, the animation will smoothly decelerate, and
+    then reverse direction.  If the reversing mode is \c SmoothedFollow.Immediate, the
     animation will immediately begin accelerating in the reverse direction,
-    begining with a velocity of 0.  If the reversing mode is \c Sync, the
+    begining with a velocity of 0.  If the reversing mode is \c SmoothedFollow.Sync, the
     property is immediately set to the target value.
 */
 QDeclarativeSmoothedFollow::ReversingMode QDeclarativeSmoothedFollow::reversingMode() const
diff --git a/src/declarative/util/qdeclarativexmllistmodel.cpp b/src/declarative/util/qdeclarativexmllistmodel.cpp
index bdebadf..ae3b5d7 100644
--- a/src/declarative/util/qdeclarativexmllistmodel.cpp
+++ b/src/declarative/util/qdeclarativexmllistmodel.cpp
@@ -675,10 +675,10 @@ void QDeclarativeXmlListModel::setNamespaceDeclarations(const QString &declarati
     Specifies the model loading status, which can be one of the following:
 
     \list
-    \o Null - No XML data has been set for this model.
-    \o Ready - The XML data has been loaded into the model.
-    \o Loading - The model is in the process of reading and loading XML data.
-    \o Error - An error occurred while the model was loading.
+    \o XmlListModel.Null - No XML data has been set for this model.
+    \o XmlListModel.Ready - The XML data has been loaded into the model.
+    \o XmlListModel.Loading - The model is in the process of reading and loading XML data.
+    \o XmlListModel.Error - An error occurred while the model was loading.
     \endlist
 
     \sa progress
-- 
cgit v0.12


From b1bf4b23fb34337ea1b5ebdd5aedaad48f5c9f4a Mon Sep 17 00:00:00 2001
From: Martin Jones 
Date: Wed, 5 May 2010 15:13:35 +1000
Subject: Test for QList model with object properties changing.

---
 .../tst_qdeclarativevisualdatamodel.cpp            | 99 ++++++++++++++++++++++
 1 file changed, 99 insertions(+)

diff --git a/tests/auto/declarative/qdeclarativevisualdatamodel/tst_qdeclarativevisualdatamodel.cpp b/tests/auto/declarative/qdeclarativevisualdatamodel/tst_qdeclarativevisualdatamodel.cpp
index 7de15a3..c238ef9 100644
--- a/tests/auto/declarative/qdeclarativevisualdatamodel/tst_qdeclarativevisualdatamodel.cpp
+++ b/tests/auto/declarative/qdeclarativevisualdatamodel/tst_qdeclarativevisualdatamodel.cpp
@@ -44,6 +44,10 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -74,9 +78,50 @@ public:
 
 private slots:
     void rootIndex();
+    void objectListModel();
 
 private:
     QDeclarativeEngine engine;
+    template
+    T *findItem(QGraphicsObject *parent, const QString &objectName, int index);
+};
+
+class DataObject : public QObject
+{
+    Q_OBJECT
+
+    Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
+    Q_PROPERTY(QString color READ color WRITE setColor NOTIFY colorChanged)
+
+public:
+    DataObject(QObject *parent=0) : QObject(parent) {}
+    DataObject(const QString &name, const QString &color, QObject *parent=0)
+        : QObject(parent), m_name(name), m_color(color) { }
+
+
+    QString name() const { return m_name; }
+    void setName(const QString &name) {
+        if (name != m_name) {
+            m_name = name;
+            emit nameChanged();
+        }
+    }
+
+    QString color() const { return m_color; }
+    void setColor(const QString &color) {
+        if (color != m_color) {
+            m_color = color;
+            emit colorChanged();
+        }
+    }
+
+signals:
+    void nameChanged();
+    void colorChanged();
+
+private:
+    QString m_name;
+    QString m_color;
 };
 
 tst_qdeclarativevisualdatamodel::tst_qdeclarativevisualdatamodel()
@@ -105,6 +150,60 @@ void tst_qdeclarativevisualdatamodel::rootIndex()
     delete obj;
 }
 
+void tst_qdeclarativevisualdatamodel::objectListModel()
+{
+    QDeclarativeView view;
+
+    QList dataList;
+    dataList.append(new DataObject("Item 1", "red"));
+    dataList.append(new DataObject("Item 2", "green"));
+    dataList.append(new DataObject("Item 3", "blue"));
+    dataList.append(new DataObject("Item 4", "yellow"));
+
+    QDeclarativeContext *ctxt = view.rootContext();
+    ctxt->setContextProperty("myModel", QVariant::fromValue(dataList));
+
+    view.setSource(QUrl::fromLocalFile(SRCDIR "/data/objectlist.qml"));
+
+    QDeclarativeListView *listview = qobject_cast(view.rootObject());
+    QVERIFY(listview != 0);
+
+    QDeclarativeItem *viewport = listview->viewport();
+    QVERIFY(viewport != 0);
+
+    QDeclarativeText *name = findItem(viewport, "name", 0);
+    QCOMPARE(name->text(), QString("Item 1"));
+
+    dataList[0]->setProperty("name", QLatin1String("Changed"));
+    QCOMPARE(name->text(), QString("Changed"));
+}
+
+template
+T *tst_qdeclarativevisualdatamodel::findItem(QGraphicsObject *parent, const QString &objectName, int index)
+{
+    const QMetaObject &mo = T::staticMetaObject;
+    //qDebug() << parent->childItems().count() << "children";
+    for (int i = 0; i < parent->childItems().count(); ++i) {
+        QDeclarativeItem *item = qobject_cast(parent->childItems().at(i));
+        if(!item)
+            continue;
+        //qDebug() << "try" << item;
+        if (mo.cast(item) && (objectName.isEmpty() || item->objectName() == objectName)) {
+            if (index != -1) {
+                QDeclarativeExpression e(qmlContext(item), "index", item);
+                if (e.evaluate().toInt() == index)
+                    return static_cast(item);
+            } else {
+                return static_cast(item);
+            }
+        }
+        item = findItem(item, objectName, index);
+        if (item)
+        return static_cast(item);
+    }
+
+    return 0;
+}
 
 QTEST_MAIN(tst_qdeclarativevisualdatamodel)
 
-- 
cgit v0.12


From ba8ff70b5ac7b68be57a4b63e439fd5a37c4aafa Mon Sep 17 00:00:00 2001
From: Martin Jones 
Date: Wed, 5 May 2010 15:24:53 +1000
Subject: Turn off smooth rendering for qDrawBorderPixmap() with transforms. On
 non-gl graphics systems smooth rendering of qDrawBorderPixmap() with a
 transform applied resulted in ugly artifacts.  Better to draw without smooth
 and get a correct looking result, though with jaggy edges.

Task-number: QTBUG-5687
Reviewed-by: Gunnar
---
 src/gui/painting/qdrawutil.cpp | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/gui/painting/qdrawutil.cpp b/src/gui/painting/qdrawutil.cpp
index a62f06b..ef9b18c 100644
--- a/src/gui/painting/qdrawutil.cpp
+++ b/src/gui/painting/qdrawutil.cpp
@@ -1137,6 +1137,15 @@ void qDrawBorderPixmap(QPainter *painter, const QRect &targetRect, const QMargin
     xTarget.resize(columns + 1);
     yTarget.resize(rows + 1);
 
+    bool oldAA = painter->testRenderHint(QPainter::Antialiasing);
+    bool oldSmooth = painter->testRenderHint(QPainter::SmoothPixmapTransform);
+    if (painter->paintEngine()->type() != QPaintEngine::OpenGL
+        && painter->paintEngine()->type() != QPaintEngine::OpenGL2
+        && (oldSmooth || oldAA) && painter->combinedTransform().type() != QTransform::TxNone) {
+        painter->setRenderHint(QPainter::Antialiasing, false);
+        painter->setRenderHint(QPainter::SmoothPixmapTransform, false);
+    }
+
     xTarget[0] = targetRect.left();
     xTarget[1] = targetCenterLeft;
     xTarget[columns - 1] = targetCenterRight;
@@ -1342,6 +1351,11 @@ void qDrawBorderPixmap(QPainter *painter, const QRect &targetRect, const QMargin
         painter->drawPixmapFragments(opaqueData.data(), opaqueData.size(), pixmap, QPainter::OpaqueHint);
     if (translucentData.size())
         painter->drawPixmapFragments(translucentData.data(), translucentData.size(), pixmap);
+
+    if (oldAA)
+        painter->setRenderHint(QPainter::Antialiasing, true);
+    if (oldSmooth)
+        painter->setRenderHint(QPainter::SmoothPixmapTransform, true);
 }
 
 QT_END_NAMESPACE
-- 
cgit v0.12


From 06c8e20cd7c04c5a11eee5b5a255099fa29bb3e4 Mon Sep 17 00:00:00 2001
From: Bea Lam 
Date: Wed, 5 May 2010 14:29:16 +1000
Subject: Fix qdoc errors

---
 doc/src/declarative/advtutorial.qdoc                      | 2 +-
 src/declarative/graphicsitems/qdeclarativeitem.cpp        | 8 +-------
 src/declarative/graphicsitems/qdeclarativepainteditem.cpp | 2 +-
 src/declarative/graphicsitems/qdeclarativetextinput.cpp   | 4 ++--
 src/declarative/qml/qdeclarativeengine.cpp                | 2 +-
 src/declarative/qml/qdeclarativepropertyvaluesource.cpp   | 3 +++
 6 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/doc/src/declarative/advtutorial.qdoc b/doc/src/declarative/advtutorial.qdoc
index 7d2967e..8f95190 100644
--- a/doc/src/declarative/advtutorial.qdoc
+++ b/doc/src/declarative/advtutorial.qdoc
@@ -468,6 +468,6 @@ By following this tutorial you've seen how you can write a fully functional appl
 \endlist
 
 There is so much more to learn about QML that we haven't been able to cover in this tutorial. Check out all the
-demos and examples and the \l {Declarative UI (QML)}{documentation} to find out all the things you can do with QML!
+demos and examples and the \l {Declarative UI Using QML}{documentation} to find out all the things you can do with QML!
 
 */
diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp
index a0983cc..0395766 100644
--- a/src/declarative/graphicsitems/qdeclarativeitem.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp
@@ -1632,10 +1632,6 @@ void QDeclarativeItemPrivate::parentProperty(QObject *o, void *rv, QDeclarativeN
     specify it.
  */
 
-/*!
-    \internal
-*/
-
 /*! \internal */
 QDeclarativeListProperty QDeclarativeItemPrivate::data()
 {
@@ -1646,7 +1642,7 @@ QDeclarativeListProperty QDeclarativeItemPrivate::data()
     \property QDeclarativeItem::childrenRect
     \brief The geometry of an item's children.
 
-    childrenRect provides an easy way to access the (collective) position and size of the item's children.
+    This property holds the (collective) position and size of the item's children.
 */
 QRectF QDeclarativeItem::childrenRect()
 {
@@ -2966,7 +2962,6 @@ void QDeclarativeItem::setFocus(bool focus)
 }
 
 /*!
-    \reimp
     \internal
 */
 void QDeclarativeItem::paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *)
@@ -2974,7 +2969,6 @@ void QDeclarativeItem::paint(QPainter *, const QStyleOptionGraphicsItem *, QWidg
 }
 
 /*!
-    \reimp
     \internal
 */
 bool QDeclarativeItem::event(QEvent *ev)
diff --git a/src/declarative/graphicsitems/qdeclarativepainteditem.cpp b/src/declarative/graphicsitems/qdeclarativepainteditem.cpp
index 5dd7e5d..6430fae 100644
--- a/src/declarative/graphicsitems/qdeclarativepainteditem.cpp
+++ b/src/declarative/graphicsitems/qdeclarativepainteditem.cpp
@@ -231,7 +231,7 @@ void QDeclarativePaintedItem::setCacheFrozen(bool frozen)
 }
 
 /*!
-    \reimp
+    \internal
 */
 void QDeclarativePaintedItem::paint(QPainter *p, const QStyleOptionGraphicsItem *, QWidget *)
 {
diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
index b04e36e..a1fa8c6 100644
--- a/src/declarative/graphicsitems/qdeclarativetextinput.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
@@ -828,7 +828,7 @@ void QDeclarativeTextInput::moveCursor()
 }
 
 /*!
-    \qmlmethod int xToPosition(int x)
+    \qmlmethod int TextInput::xToPosition(int x)
 
     This function returns the character position at
     x pixels from the left of the textInput. Position 0 is before the
@@ -1097,7 +1097,7 @@ QString QDeclarativeTextInput::displayText() const
 }
 
 /*!
-    \qmlmethod void moveCursorSelection(int position)
+    \qmlmethod void TextInput::moveCursorSelection(int position)
 
     Moves the cursor to \a position and updates the selection accordingly.
     (To only move the cursor, set the \l cursorPosition property.)
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp
index dee5ec6..ac60758 100644
--- a/src/declarative/qml/qdeclarativeengine.cpp
+++ b/src/declarative/qml/qdeclarativeengine.cpp
@@ -1550,7 +1550,7 @@ QStringList QDeclarativeEngine::importPathList() const
 }
 
 /*!
-  Sets the list of directories where the engine searches for
+  Sets \a paths as the list of directories where the engine searches for
   installed modules in a URL-based directory structure.
 
   By default, the list contains the paths specified in the \c QML_IMPORT_PATH environment
diff --git a/src/declarative/qml/qdeclarativepropertyvaluesource.cpp b/src/declarative/qml/qdeclarativepropertyvaluesource.cpp
index a0ed78f..039998f 100644
--- a/src/declarative/qml/qdeclarativepropertyvaluesource.cpp
+++ b/src/declarative/qml/qdeclarativepropertyvaluesource.cpp
@@ -60,6 +60,9 @@ QDeclarativePropertyValueSource::QDeclarativePropertyValueSource()
 {
 }
 
+/*!
+    Destroys the value source.
+*/
 QDeclarativePropertyValueSource::~QDeclarativePropertyValueSource()
 {
 }
-- 
cgit v0.12


From dc4f8e4b23a4b07efe1605c2ae479e219b456df9 Mon Sep 17 00:00:00 2001
From: Bea Lam 
Date: Wed, 5 May 2010 15:41:08 +1000
Subject: Docs - point to property types from tutorial and QML Basic Types page

---
 doc/src/declarative/basictypes.qdoc |  9 ++++++---
 doc/src/declarative/tutorial.qdoc   | 14 +++++++-------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/doc/src/declarative/basictypes.qdoc b/doc/src/declarative/basictypes.qdoc
index 6901947..8db1c35 100644
--- a/doc/src/declarative/basictypes.qdoc
+++ b/doc/src/declarative/basictypes.qdoc
@@ -43,9 +43,12 @@
   \page qdeclarativebasictypes.html
   \title QML Basic Types
 
-  QML uses a set of property types, which are primitive within QML.
-  These basic types are referenced throughout the documentation of the
-  QML elements. Almost all of them are exactly what you would expect.
+  QML has a set of primitive types, as listed below, that are used throughout
+  the \l {QML Elements}.
+
+  The simpler types in this list can also be used for defining a new
+  \c property in a component. See \l{Extending types from QML} for the
+  list of types that can be used for custom properties.
 
   \annotatedlist qmlbasictypes
 */
diff --git a/doc/src/declarative/tutorial.qdoc b/doc/src/declarative/tutorial.qdoc
index 4cfb999..75c0f851 100644
--- a/doc/src/declarative/tutorial.qdoc
+++ b/doc/src/declarative/tutorial.qdoc
@@ -57,10 +57,10 @@ The tutorial's source code is located in the $QTDIR/examples/declarative/tutoria
 
 Tutorial chapters:
 
-\list
-\o \l {QML Tutorial 1 - Basic Types}
-\o \l {QML Tutorial 2 - QML Component}
-\o \l {QML Tutorial 3 - States and Transitions}
+\list 1
+\o \l {QML Tutorial 1 - Basic Types}{Basic Types}
+\o \l {QML Tutorial 2 - QML Components}{QML Components}
+\o \l {QML Tutorial 3 - States and Transitions}{States and Transitions}
 \endlist
 
 */
@@ -125,7 +125,7 @@ bin/qml $QTDIR/examples/declarative/tutorials/helloworld/tutorial1.qml
 
 /*!
 \page qml-tutorial2.html
-\title QML Tutorial 2 - QML Component
+\title QML Tutorial 2 - QML Components
 \contentspage QML Tutorial
 \previouspage QML Tutorial 1 - Basic Types
 \nextpage QML Tutorial 3 - States and Transitions
@@ -137,7 +137,7 @@ This chapter adds a color picker to change the color of the text.
 Our color picker is made of six cells with different colors.
 To avoid writing the same code multiple times for each cell, we create a new \c Cell component.
 A component provides a way of defining a new type that we can re-use in other QML files.
-A QML component is like a black-box and interacts with the outside world through properties, signals and slots and is generally
+A QML component is like a black-box and interacts with the outside world through properties, signals and functions and is generally
 defined in its own QML file. (For more details, see \l {Defining new Components}).
 The component's filename must always start with a capital letter.
 
@@ -158,7 +158,7 @@ An \l Item is the most basic visual element in QML and is often used as a contai
 
 We declare a \c cellColor property. This property is accessible from  \e outside our component, this allows us
 to instantiate the cells with different colors.
-This property is just an alias to an existing property - the color of the rectangle that compose the cell (see \l{intro-properties}{Properties}).
+This property is just an alias to an existing property - the color of the rectangle that compose the cell (see \l{Adding new properties}).
 
 \snippet examples/declarative/tutorials/helloworld/Cell.qml 5
 
-- 
cgit v0.12


From f8af54e12bcb6e991315c53eca758c43653610fa Mon Sep 17 00:00:00 2001
From: Martin Jones 
Date: Wed, 5 May 2010 15:54:33 +1000
Subject: little doc fix.

---
 src/declarative/util/qdeclarativesmoothedfollow.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/declarative/util/qdeclarativesmoothedfollow.cpp b/src/declarative/util/qdeclarativesmoothedfollow.cpp
index e919282..f70df9d 100644
--- a/src/declarative/util/qdeclarativesmoothedfollow.cpp
+++ b/src/declarative/util/qdeclarativesmoothedfollow.cpp
@@ -143,7 +143,7 @@ QDeclarativeSmoothedFollowPrivate::QDeclarativeSmoothedFollowPrivate()
 
     Sets how the SmoothedFollow behaves if an animation direction is reversed.
 
-    If reversing mode is \SmoothedFollow.c Eased, the animation will smoothly decelerate, and
+    If reversing mode is \c SmoothedFollow.Eased, the animation will smoothly decelerate, and
     then reverse direction.  If the reversing mode is \c SmoothedFollow.Immediate, the
     animation will immediately begin accelerating in the reverse direction,
     begining with a velocity of 0.  If the reversing mode is \c SmoothedFollow.Sync, the
-- 
cgit v0.12


From 80c04413ba2c1a20a5d93d69df92ba908c26d81d Mon Sep 17 00:00:00 2001
From: Martin Jones 
Date: Wed, 5 May 2010 16:03:16 +1000
Subject: Document delegate life cycle.

Task-number: QTBUG-10353
---
 src/declarative/graphicsitems/qdeclarativegridview.cpp | 3 +++
 src/declarative/graphicsitems/qdeclarativelistview.cpp | 3 +++
 src/declarative/graphicsitems/qdeclarativepathview.cpp | 6 +++++-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/declarative/graphicsitems/qdeclarativegridview.cpp b/src/declarative/graphicsitems/qdeclarativegridview.cpp
index f55c483..4c72482 100644
--- a/src/declarative/graphicsitems/qdeclarativegridview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativegridview.cpp
@@ -908,6 +908,9 @@ void QDeclarativeGridViewPrivate::flick(AxisData &data, qreal minExtent, qreal m
     In this case ListModel is a handy way for us to test our UI.  In practice
     the model would be implemented in C++, or perhaps via a SQL data source.
 
+    Delegates are instantiated as needed and may be destroyed at any time.
+    State should \e never be stored in a delegate.
+
     \bold Note that views do not enable \e clip automatically.  If the view
     is not clipped by another item or the screen, it will be necessary
     to set \e {clip: true} in order to have the out of view items clipped
diff --git a/src/declarative/graphicsitems/qdeclarativelistview.cpp b/src/declarative/graphicsitems/qdeclarativelistview.cpp
index 589b8e2..3877fab 100644
--- a/src/declarative/graphicsitems/qdeclarativelistview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativelistview.cpp
@@ -1314,6 +1314,9 @@ void QDeclarativeListViewPrivate::flick(AxisData &data, qreal minExtent, qreal m
     In this case ListModel is a handy way for us to test our UI.  In practice
     the model would be implemented in C++, or perhaps via a SQL data source.
 
+    Delegates are instantiated as needed and may be destroyed at any time.
+    State should \e never be stored in a delegate.
+
     \bold Note that views do not enable \e clip automatically.  If the view
     is not clipped by another item or the screen, it will be necessary
     to set \e {clip: true} in order to have the out of view items clipped
diff --git a/src/declarative/graphicsitems/qdeclarativepathview.cpp b/src/declarative/graphicsitems/qdeclarativepathview.cpp
index 9ae6f9d..5c3a3c0 100644
--- a/src/declarative/graphicsitems/qdeclarativepathview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativepathview.cpp
@@ -308,12 +308,16 @@ void QDeclarativePathViewPrivate::regenerate()
 
     The model is typically provided by a QAbstractListModel "C++ model object", but can also be created directly in QML.
 
-    The items are laid out along a path defined by a \l Path and may be flicked to scroll.
+    The \l delegate is instantiated for each item on the \l path.
+    The items may be flicked to move them along the path.
 
     \snippet doc/src/snippets/declarative/pathview/pathview.qml 0
 
     \image pathview.gif
 
+    Delegates are instantiated as needed and may be destroyed at any time.
+    State should \e never be stored in a delegate.
+
     \bold Note that views do not enable \e clip automatically.  If the view
     is not clipped by another item or the screen, it will be necessary
     to set \e {clip: true} in order to have the out of view items clipped
-- 
cgit v0.12


From f5e3e21e95275a8cf31cddf2063dfa497e92872e Mon Sep 17 00:00:00 2001
From: Yann Bodson 
Date: Wed, 5 May 2010 16:22:51 +1000
Subject: Use enum rather than string for easing type.

---
 demos/declarative/calculator/calculator.qml        |   4 +-
 demos/declarative/flickr/flickr.qml                |   4 +-
 demos/declarative/flickr/mobile/GridDelegate.qml   |   6 +-
 demos/declarative/flickr/mobile/ImageDetails.qml   |   2 +-
 demos/declarative/flickr/mobile/TitleBar.qml       |   2 +-
 demos/declarative/minehunt/MinehuntCore/Tile.qml   |   2 +-
 .../photoviewer/PhotoViewerCore/AlbumDelegate.qml  |   8 +-
 .../twitter/TwitterCore/HomeTitleBar.qml           |   2 +-
 .../twitter/TwitterCore/MultiTitleBar.qml          |   2 +-
 demos/declarative/twitter/TwitterCore/TitleBar.qml |   2 +-
 demos/declarative/twitter/twitter.qml              |   2 +-
 .../content/RetractingWebBrowserHeader.qml         |   2 +-
 demos/declarative/webbrowser/webbrowser.qml        |   4 +-
 examples/declarative/animations/easing.qml         | 104 +++++++++++----------
 .../declarative/animations/property-animation.qml  |   4 +-
 .../declarative/behaviors/behavior-example.qml     |   4 +-
 .../border-image/content/MyBorderImage.qml         |  20 +++-
 .../connections/connections-example.qml            |   2 +-
 examples/declarative/focus/Core/ListViews.qml      |   6 +-
 examples/declarative/focus/focus.qml               |   4 +-
 examples/declarative/fonts/hello.qml               |   2 +-
 examples/declarative/layouts/Button.qml            |  42 ++++++---
 examples/declarative/layouts/positioners.qml       |  16 ++--
 examples/declarative/parallax/qml/Smiley.qml       |   4 +-
 examples/declarative/proxywidgets/proxywidgets.qml |   2 +-
 .../declarative/slideswitch/content/Switch.qml     |   2 +-
 examples/declarative/states/transitions.qml        |   4 +-
 .../declarative/tutorials/helloworld/tutorial3.qml |   2 +-
 examples/declarative/xmldata/yahoonews.qml         |   2 +-
 .../graphicsitems/qdeclarativegridview.cpp         |   2 +-
 .../graphicsitems/qdeclarativelistview.cpp         |   2 +-
 .../graphicsitems/qdeclarativepositioners.cpp      |   2 +-
 src/declarative/util/qdeclarativeanimation.cpp     |   2 +-
 src/declarative/util/qdeclarativebehavior.cpp      |   2 +-
 src/declarative/util/qdeclarativespringfollow.cpp  |   2 +-
 35 files changed, 154 insertions(+), 120 deletions(-)

diff --git a/demos/declarative/calculator/calculator.qml b/demos/declarative/calculator/calculator.qml
index 286a4d1..75f5735 100644
--- a/demos/declarative/calculator/calculator.qml
+++ b/demos/declarative/calculator/calculator.qml
@@ -98,8 +98,8 @@ Rectangle {
         transitions: Transition {
             SequentialAnimation {
                 PropertyAction { target: rotateButton; property: "operation" }
-                NumberAnimation { properties: "rotation"; duration: 300; easing.type: "InOutQuint" }
-                NumberAnimation { properties: "x,y,width,height"; duration: 300; easing.type: "InOutQuint" }
+                NumberAnimation { properties: "rotation"; duration: 300; easing.type: Easing.InOutQuint }
+                NumberAnimation { properties: "x,y,width,height"; duration: 300; easing.type: Easing.InOutQuint }
             }
         }
     }
diff --git a/demos/declarative/flickr/flickr.qml b/demos/declarative/flickr/flickr.qml
index 8b73beb..29763d4 100644
--- a/demos/declarative/flickr/flickr.qml
+++ b/demos/declarative/flickr/flickr.qml
@@ -38,7 +38,7 @@ Item {
             }
 
             transitions: Transition {
-                NumberAnimation { properties: "x"; duration: 500; easing.type: "InOutQuad" }
+                NumberAnimation { properties: "x"; duration: 500; easing.type: Easing.InOutQuad }
             }
         }
 
@@ -76,7 +76,7 @@ Item {
         }
 
         transitions: Transition {
-            NumberAnimation { properties: "x"; duration: 500; easing.type: "InOutQuad" }
+            NumberAnimation { properties: "x"; duration: 500; easing.type: Easing.InOutQuad }
         }
     }
 }
diff --git a/demos/declarative/flickr/mobile/GridDelegate.qml b/demos/declarative/flickr/mobile/GridDelegate.qml
index 5ab7b87..eccdc34 100644
--- a/demos/declarative/flickr/mobile/GridDelegate.qml
+++ b/demos/declarative/flickr/mobile/GridDelegate.qml
@@ -21,7 +21,7 @@
          Item {
              anchors.centerIn: parent
              scale: 0.0
-             Behavior on scale { NumberAnimation { easing.type: "InOutQuad"} }
+             Behavior on scale { NumberAnimation { easing.type: Easing.InOutQuad} }
              id: scaleMe
 
              Rectangle { height: 79; width: 79; id: blackRect;  anchors.centerIn: parent; color: "black"; smooth: true }
@@ -53,14 +53,14 @@
                  Transition {
                      from: "Show"; to: "Details"
                      ParentAnimation {
-                         NumberAnimation { properties: "x,y"; duration: 500; easing.type: "InOutQuad" }
+                         NumberAnimation { properties: "x,y"; duration: 500; easing.type: Easing.InOutQuad }
                      }
                  },
                  Transition {
                      from: "Details"; to: "Show"
                      SequentialAnimation {
                          ParentAnimation {
-                            NumberAnimation { properties: "x,y"; duration: 500; easing.type: "InOutQuad" }
+                            NumberAnimation { properties: "x,y"; duration: 500; easing.type: Easing.InOutQuad }
                          }
                          PropertyAction { targets: wrapper; properties: "z" }
                      }
diff --git a/demos/declarative/flickr/mobile/ImageDetails.qml b/demos/declarative/flickr/mobile/ImageDetails.qml
index 58b0b83..310c9df 100644
--- a/demos/declarative/flickr/mobile/ImageDetails.qml
+++ b/demos/declarative/flickr/mobile/ImageDetails.qml
@@ -114,7 +114,7 @@ Flipable {
     transitions: Transition {
         SequentialAnimation {
             PropertyAction { target: bigImage; property: "smooth"; value: false }
-            NumberAnimation { easing.type: "InOutQuad"; properties: "angle"; duration: 500 }
+            NumberAnimation { easing.type: Easing.InOutQuad; properties: "angle"; duration: 500 }
             PropertyAction { target: bigImage; property: "smooth"; value: !flickable.moving }
         }
     }
diff --git a/demos/declarative/flickr/mobile/TitleBar.qml b/demos/declarative/flickr/mobile/TitleBar.qml
index bb57429..025b897 100644
--- a/demos/declarative/flickr/mobile/TitleBar.qml
+++ b/demos/declarative/flickr/mobile/TitleBar.qml
@@ -81,6 +81,6 @@ Item {
     }
 
     transitions: Transition {
-        NumberAnimation { properties: "x"; easing.type: "InOutQuad" }
+        NumberAnimation { properties: "x"; easing.type: Easing.InOutQuad }
     }
 }
diff --git a/demos/declarative/minehunt/MinehuntCore/Tile.qml b/demos/declarative/minehunt/MinehuntCore/Tile.qml
index f3620f4..98b2017 100644
--- a/demos/declarative/minehunt/MinehuntCore/Tile.qml
+++ b/demos/declarative/minehunt/MinehuntCore/Tile.qml
@@ -57,7 +57,7 @@ Flipable {
             PauseAnimation {
                 duration: pauseDur
             }
-            RotationAnimation { easing.type: "InOutQuad" }
+            RotationAnimation { easing.type: Easing.InOutQuad }
             ScriptAction { script: if (modelData.hasMine && modelData.flipped) { expl.explode = true } }
         }
     }
diff --git a/demos/declarative/photoviewer/PhotoViewerCore/AlbumDelegate.qml b/demos/declarative/photoviewer/PhotoViewerCore/AlbumDelegate.qml
index d39b7bc..142735f 100644
--- a/demos/declarative/photoviewer/PhotoViewerCore/AlbumDelegate.qml
+++ b/demos/declarative/photoviewer/PhotoViewerCore/AlbumDelegate.qml
@@ -78,11 +78,11 @@ Component {
             ]
 
             GridView.onAdd: NumberAnimation {
-                target: albumWrapper; properties: "scale"; from: 0.0; to: 1.0; easing.type: "OutQuad"
+                target: albumWrapper; properties: "scale"; from: 0.0; to: 1.0; easing.type: Easing.OutQuad
             }
             GridView.onRemove: SequentialAnimation {
                 PropertyAction { target: albumWrapper; property: "GridView.delayRemove"; value: true }
-                NumberAnimation { target: albumWrapper; property: "scale"; from: 1.0; to: 0.0; easing.type: "OutQuad" }
+                NumberAnimation { target: albumWrapper; property: "scale"; from: 1.0; to: 0.0; easing.type: Easing.OutQuad }
                 PropertyAction { target: albumWrapper; property: "GridView.delayRemove"; value: false }
             }
 
@@ -92,12 +92,12 @@ Component {
                 SequentialAnimation {
                     NumberAnimation { properties: 'opacity'; duration: 250 }
                     PauseAnimation { duration: 350 }
-                    NumberAnimation { target: backButton; properties: "y"; duration: 200; easing.type: "OutQuad" }
+                    NumberAnimation { target: backButton; properties: "y"; duration: 200; easing.type: Easing.OutQuad }
                 }
             },
             Transition {
                 from: 'inGrid'; to: '*'
-                NumberAnimation { properties: "y,opacity"; easing.type: "OutQuad"; duration: 300 }
+                NumberAnimation { properties: "y,opacity"; easing.type: Easing.OutQuad; duration: 300 }
             }
             ]
         }
diff --git a/demos/declarative/twitter/TwitterCore/HomeTitleBar.qml b/demos/declarative/twitter/TwitterCore/HomeTitleBar.qml
index c1ae3e5..11aa74f 100644
--- a/demos/declarative/twitter/TwitterCore/HomeTitleBar.qml
+++ b/demos/declarative/twitter/TwitterCore/HomeTitleBar.qml
@@ -113,7 +113,7 @@ Item {
     transitions: [
         Transition {
             from: "*"; to: "*"
-            NumberAnimation { properties: "x,y,width,height"; easing.type: "InOutQuad" }
+            NumberAnimation { properties: "x,y,width,height"; easing.type: Easing.InOutQuad }
         }
     ]
 }
diff --git a/demos/declarative/twitter/TwitterCore/MultiTitleBar.qml b/demos/declarative/twitter/TwitterCore/MultiTitleBar.qml
index 8c27e2b..445eda4 100644
--- a/demos/declarative/twitter/TwitterCore/MultiTitleBar.qml
+++ b/demos/declarative/twitter/TwitterCore/MultiTitleBar.qml
@@ -18,7 +18,7 @@ Item {
         }
     ]
     transitions: [
-        Transition { NumberAnimation { properties: "x,y"; duration: 500; easing.type: "InOutQuad" } }
+        Transition { NumberAnimation { properties: "x,y"; duration: 500; easing.type: Easing.InOutQuad } }
     ]
 }
 
diff --git a/demos/declarative/twitter/TwitterCore/TitleBar.qml b/demos/declarative/twitter/TwitterCore/TitleBar.qml
index 87ceec5..5256de4 100644
--- a/demos/declarative/twitter/TwitterCore/TitleBar.qml
+++ b/demos/declarative/twitter/TwitterCore/TitleBar.qml
@@ -70,6 +70,6 @@ Item {
     }
 
     transitions: Transition {
-        NumberAnimation { properties: "x"; easing.type: "InOutQuad" }
+        NumberAnimation { properties: "x"; easing.type: Easing.InOutQuad }
     }
 }
diff --git a/demos/declarative/twitter/twitter.qml b/demos/declarative/twitter/twitter.qml
index 0e3ec3e..f86388e 100644
--- a/demos/declarative/twitter/twitter.qml
+++ b/demos/declarative/twitter/twitter.qml
@@ -88,7 +88,7 @@ Item {
             }
         ]
         transitions: [
-            Transition { NumberAnimation { properties: "x,y"; duration: 500; easing.type: "InOutQuad" } }
+            Transition { NumberAnimation { properties: "x,y"; duration: 500; easing.type: Easing.InOutQuad } }
         ]
     }
 }
diff --git a/demos/declarative/webbrowser/content/RetractingWebBrowserHeader.qml b/demos/declarative/webbrowser/content/RetractingWebBrowserHeader.qml
index f5bfadf..b02a5bf 100644
--- a/demos/declarative/webbrowser/content/RetractingWebBrowserHeader.qml
+++ b/demos/declarative/webbrowser/content/RetractingWebBrowserHeader.qml
@@ -105,7 +105,7 @@ Image {
             NumberAnimation {
                 targets: header
                 properties: "progressOff"
-                easing.type: "InOutQuad"
+                easing.type: Easing.InOutQuad
                 duration: 300
             }
         }
diff --git a/demos/declarative/webbrowser/webbrowser.qml b/demos/declarative/webbrowser/webbrowser.qml
index fbbe7b2..f1a6034 100644
--- a/demos/declarative/webbrowser/webbrowser.qml
+++ b/demos/declarative/webbrowser/webbrowser.qml
@@ -99,7 +99,7 @@ Item {
                     Transition {
                         NumberAnimation {
                             properties: "opacity"
-                            easing.type: "InOutQuad"
+                            easing.type: Easing.InOutQuad
                             duration: 300
                         }
                     }
@@ -155,7 +155,7 @@ Item {
                     Transition {
                         NumberAnimation {
                             properties: "opacity"
-                            easing.type: "InOutQuad"
+                            easing.type: Easing.InOutQuad
                             duration: 320
                         }
                     }
diff --git a/examples/declarative/animations/easing.qml b/examples/declarative/animations/easing.qml
index b0f9669..939d43b 100644
--- a/examples/declarative/animations/easing.qml
+++ b/examples/declarative/animations/easing.qml
@@ -6,47 +6,47 @@ Rectangle {
 
     ListModel {
         id: easingTypes
-        ListElement { type: "Linear"; ballColor: "DarkRed" }
-        ListElement { type: "InQuad"; ballColor: "IndianRed" }
-        ListElement { type: "OutQuad"; ballColor: "Salmon" }
-        ListElement { type: "InOutQuad"; ballColor: "Tomato" }
-        ListElement { type: "OutInQuad"; ballColor: "DarkOrange" }
-        ListElement { type: "InCubic"; ballColor: "Gold" }
-        ListElement { type: "OutCubic"; ballColor: "Yellow" }
-        ListElement { type: "InOutCubic"; ballColor: "PeachPuff" }
-        ListElement { type: "OutInCubic"; ballColor: "Thistle" }
-        ListElement { type: "InQuart"; ballColor: "Orchid" }
-        ListElement { type: "OutQuart"; ballColor: "Purple" }
-        ListElement { type: "InOutQuart"; ballColor: "SlateBlue" }
-        ListElement { type: "OutInQuart"; ballColor: "Chartreuse" }
-        ListElement { type: "InQuint"; ballColor: "LimeGreen" }
-        ListElement { type: "OutQuint"; ballColor: "SeaGreen" }
-        ListElement { type: "InOutQuint"; ballColor: "DarkGreen" }
-        ListElement { type: "OutInQuint"; ballColor: "Olive" }
-        ListElement { type: "InSine"; ballColor: "DarkSeaGreen" }
-        ListElement { type: "OutSine"; ballColor: "Teal" }
-        ListElement { type: "InOutSine"; ballColor: "Turquoise" }
-        ListElement { type: "OutInSine"; ballColor: "SteelBlue" }
-        ListElement { type: "InExpo"; ballColor: "SkyBlue" }
-        ListElement { type: "OutExpo"; ballColor: "RoyalBlue" }
-        ListElement { type: "InOutExpo"; ballColor: "MediumBlue" }
-        ListElement { type: "OutInExpo"; ballColor: "MidnightBlue" }
-        ListElement { type: "InCirc"; ballColor: "CornSilk" }
-        ListElement { type: "OutCirc"; ballColor: "Bisque" }
-        ListElement { type: "InOutCirc"; ballColor: "RosyBrown" }
-        ListElement { type: "OutInCirc"; ballColor: "SandyBrown" }
-        ListElement { type: "InElastic"; ballColor: "DarkGoldenRod" }
-        ListElement { type: "OutElastic"; ballColor: "Chocolate" }
-        ListElement { type: "InOutElastic"; ballColor: "SaddleBrown" }
-        ListElement { type: "OutInElastic"; ballColor: "Brown" }
-        ListElement { type: "InBack"; ballColor: "Maroon" }
-        ListElement { type: "OutBack"; ballColor: "LavenderBlush" }
-        ListElement { type: "InOutBack"; ballColor: "MistyRose" }
-        ListElement { type: "OutInBack"; ballColor: "Gainsboro" }
-        ListElement { type: "OutBounce"; ballColor: "Silver" }
-        ListElement { type: "InBounce"; ballColor: "DimGray" }
-        ListElement { type: "InOutBounce"; ballColor: "SlateGray" }
-        ListElement { type: "OutInBounce"; ballColor: "DarkSlateGray" }
+        ListElement { name: "Easing.Linear"; type: Easing.Linear; ballColor: "DarkRed" }
+        ListElement { name: "Easing.InQuad"; type: Easing.InQuad; ballColor: "IndianRed" }
+        ListElement { name: "Easing.OutQuad"; type: Easing.OutQuad; ballColor: "Salmon" }
+        ListElement { name: "Easing.InOutQuad"; type: Easing.InOutQuad; ballColor: "Tomato" }
+        ListElement { name: "Easing.OutInQuad"; type: Easing.OutInQuad; ballColor: "DarkOrange" }
+        ListElement { name: "Easing.InCubic"; type: Easing.InCubic; ballColor: "Gold" }
+        ListElement { name: "Easing.OutCubic"; type: Easing.OutCubic; ballColor: "Yellow" }
+        ListElement { name: "Easing.InOutCubic"; type: Easing.InOutCubic; ballColor: "PeachPuff" }
+        ListElement { name: "Easing.OutInCubic"; type: Easing.OutInCubic; ballColor: "Thistle" }
+        ListElement { name: "Easing.InQuart"; type: Easing.InQuart; ballColor: "Orchid" }
+        ListElement { name: "Easing.OutQuart"; type: Easing.OutQuart; ballColor: "Purple" }
+        ListElement { name: "Easing.InOutQuart"; type: Easing.InOutQuart; ballColor: "SlateBlue" }
+        ListElement { name: "Easing.OutInQuart"; type: Easing.OutInQuart; ballColor: "Chartreuse" }
+        ListElement { name: "Easing.InQuint"; type: Easing.InQuint; ballColor: "LimeGreen" }
+        ListElement { name: "Easing.OutQuint"; type: Easing.OutQuint; ballColor: "SeaGreen" }
+        ListElement { name: "Easing.InOutQuint"; type: Easing.InOutQuint; ballColor: "DarkGreen" }
+        ListElement { name: "Easing.OutInQuint"; type: Easing.OutInQuint; ballColor: "Olive" }
+        ListElement { name: "Easing.InSine"; type: Easing.InSine; ballColor: "DarkSeaGreen" }
+        ListElement { name: "Easing.OutSine"; type: Easing.OutSine; ballColor: "Teal" }
+        ListElement { name: "Easing.InOutSine"; type: Easing.InOutSine; ballColor: "Turquoise" }
+        ListElement { name: "Easing.OutInSine"; type: Easing.OutInSine; ballColor: "SteelBlue" }
+        ListElement { name: "Easing.InExpo"; type: Easing.InExpo; ballColor: "SkyBlue" }
+        ListElement { name: "Easing.OutExpo"; type: Easing.OutExpo; ballColor: "RoyalBlue" }
+        ListElement { name: "Easing.InOutExpo"; type: Easing.InOutExpo; ballColor: "MediumBlue" }
+        ListElement { name: "Easing.OutInExpo"; type: Easing.OutInExpo; ballColor: "MidnightBlue" }
+        ListElement { name: "Easing.InCirc"; type: Easing.InCirc; ballColor: "CornSilk" }
+        ListElement { name: "Easing.OutCirc"; type: Easing.OutCirc; ballColor: "Bisque" }
+        ListElement { name: "Easing.InOutCirc"; type: Easing.InOutCirc; ballColor: "RosyBrown" }
+        ListElement { name: "Easing.OutInCirc"; type: Easing.OutInCirc; ballColor: "SandyBrown" }
+        ListElement { name: "Easing.InElastic"; type: Easing.InElastic; ballColor: "DarkGoldenRod" }
+        ListElement { name: "Easing.InElastic"; type: Easing.OutElastic; ballColor: "Chocolate" }
+        ListElement { name: "Easing.InOutElastic"; type: Easing.InOutElastic; ballColor: "SaddleBrown" }
+        ListElement { name: "Easing.OutInElastic"; type: Easing.OutInElastic; ballColor: "Brown" }
+        ListElement { name: "Easing.InBack"; type: Easing.InBack; ballColor: "Maroon" }
+        ListElement { name: "Easing.OutBack"; type: Easing.OutBack; ballColor: "LavenderBlush" }
+        ListElement { name: "Easing.InOutBack"; type: Easing.InOutBack; ballColor: "MistyRose" }
+        ListElement { name: "Easing.OutInBack"; type: Easing.OutInBack; ballColor: "Gainsboro" }
+        ListElement { name: "Easing.OutBounce"; type: Easing.OutBounce; ballColor: "Silver" }
+        ListElement { name: "Easing.InBounce"; type: Easing.InBounce; ballColor: "DimGray" }
+        ListElement { name: "Easing.InOutBounce"; type: Easing.InOutBounce; ballColor: "SlateGray" }
+        ListElement { name: "Easing.OutInBounce"; type: Easing.OutInBounce; ballColor: "DarkSlateGray" }
     }
 
     Component {
@@ -54,19 +54,26 @@ Rectangle {
 
         Item {
             height: 42; width: window.width
-            Text { text: type; anchors.centerIn: parent; color: "White" }
+
+            Text { text: name; anchors.centerIn: parent; color: "White" }
+
             Rectangle {
                 id: slot1; color: "#121212"; x: 30; height: 32; width: 32
-                border.color: "#343434"; border.width: 1; radius: 8; anchors.verticalCenter: parent.verticalCenter
+                border.color: "#343434"; border.width: 1; radius: 8
+                anchors.verticalCenter: parent.verticalCenter
             }
+
             Rectangle {
                 id: slot2; color: "#121212"; x: window.width - 62; height: 32; width: 32
-                border.color: "#343434"; border.width: 1; radius: 8; anchors.verticalCenter: parent.verticalCenter
+                border.color: "#343434"; border.width: 1; radius: 8
+                anchors.verticalCenter: parent.verticalCenter
             }
+
             Rectangle {
                 id: rect; x: 30; color: "#454545"
                 border.color: "White"; border.width: 2
-                height: 32; width: 32; radius: 8; anchors.verticalCenter: parent.verticalCenter
+                height: 32; width: 32; radius: 8
+                anchors.verticalCenter: parent.verticalCenter
 
                 MouseArea {
                     onClicked: if (rect.state == '') rect.state = "right"; else rect.state = ''
@@ -79,10 +86,8 @@ Rectangle {
                 }
 
                 transitions: Transition {
-                    // ParallelAnimation {
-                        NumberAnimation { properties: "x"; easing.type: type; duration: 1000 }
-                        ColorAnimation { properties: "color"; easing.type: type; duration: 1000 }
-                    // }
+                    NumberAnimation { properties: "x"; easing.type: type; duration: 1000 }
+                    ColorAnimation { properties: "color"; easing.type: type; duration: 1000 }
                 }
             }
         }
@@ -90,6 +95,7 @@ Rectangle {
 
     Flickable {
         anchors.fill: parent; contentHeight: layout.height
+
         Column {
             id: layout
             anchors.left: parent.left; anchors.right: parent.right
diff --git a/examples/declarative/animations/property-animation.qml b/examples/declarative/animations/property-animation.qml
index 5afe8ef..6360511 100644
--- a/examples/declarative/animations/property-animation.qml
+++ b/examples/declarative/animations/property-animation.qml
@@ -48,13 +48,13 @@ Item {
             // Move from minHeight to maxHeight in 300ms, using the OutExpo easing function
             NumberAnimation {
                 from: smiley.minHeight; to: smiley.maxHeight
-                easing.type: "OutExpo"; duration: 300
+                easing.type: Easing.OutExpo; duration: 300
             }
 
             // Then move back to minHeight in 1 second, using the OutBounce easing function
             NumberAnimation {
                 from: smiley.maxHeight; to: smiley.minHeight
-                easing.type: "OutBounce"; duration: 1000
+                easing.type: Easing.OutBounce; duration: 1000
             }
 
             // Then pause for 500ms
diff --git a/examples/declarative/behaviors/behavior-example.qml b/examples/declarative/behaviors/behavior-example.qml
index b7bae6c..1f17b81 100644
--- a/examples/declarative/behaviors/behavior-example.qml
+++ b/examples/declarative/behaviors/behavior-example.qml
@@ -49,12 +49,12 @@ Rectangle {
 
             // Setting an 'elastic' behavior on the focusRect's x property.
             Behavior on x {
-                NumberAnimation { easing.type: "OutElastic"; easing.amplitude: 3.0; easing.period: 2.0; duration: 300 }
+                NumberAnimation { easing.type: Easing.OutElastic; easing.amplitude: 3.0; easing.period: 2.0; duration: 300 }
             }
 
             // Setting an 'elastic' behavior on the focusRect's y property.
             Behavior on y {
-                NumberAnimation { easing.type: "OutElastic"; easing.amplitude: 3.0; easing.period: 2.0; duration: 300 }
+                NumberAnimation { easing.type: Easing.OutElastic; easing.amplitude: 3.0; easing.period: 2.0; duration: 300 }
             }
 
             Text {
diff --git a/examples/declarative/border-image/content/MyBorderImage.qml b/examples/declarative/border-image/content/MyBorderImage.qml
index 2573a14..b47df7b 100644
--- a/examples/declarative/border-image/content/MyBorderImage.qml
+++ b/examples/declarative/border-image/content/MyBorderImage.qml
@@ -20,14 +20,26 @@ Item {
 
         SequentialAnimation on width {
             loops: Animation.Infinite
-            NumberAnimation { from: container.minWidth; to: container.maxWidth; duration: 2000; easing.type: "InOutQuad"}
-            NumberAnimation { from: container.maxWidth; to: container.minWidth; duration: 2000; easing.type: "InOutQuad" }
+            NumberAnimation {
+                from: container.minWidth; to: container.maxWidth
+                duration: 2000; easing.type: Easing.InOutQuad
+            }
+            NumberAnimation {
+                from: container.maxWidth; to: container.minWidth
+                duration: 2000; easing.type: Easing.InOutQuad
+            }
         }
 
         SequentialAnimation on height {
             loops: Animation.Infinite
-            NumberAnimation { from: container.minHeight; to: container.maxHeight; duration: 2000; easing.type: "InOutQuad"}
-            NumberAnimation { from: container.maxHeight; to: container.minHeight; duration: 2000; easing.type: "InOutQuad" }
+            NumberAnimation {
+                from: container.minHeight; to: container.maxHeight
+                duration: 2000; easing.type: Easing.InOutQuad
+            }
+            NumberAnimation {
+                from: container.maxHeight; to: container.minHeight
+                duration: 2000; easing.type: Easing.InOutQuad
+            }
         }
 
         border.top: container.margin
diff --git a/examples/declarative/connections/connections-example.qml b/examples/declarative/connections/connections-example.qml
index fbef968..1dd10ab 100644
--- a/examples/declarative/connections/connections-example.qml
+++ b/examples/declarative/connections/connections-example.qml
@@ -17,7 +17,7 @@ Rectangle {
         rotation: window.angle
 
         Behavior on rotation {
-            NumberAnimation { easing.type: "OutCubic"; duration: 300 }
+            NumberAnimation { easing.type: Easing.OutCubic; duration: 300 }
         }
     }
 
diff --git a/examples/declarative/focus/Core/ListViews.qml b/examples/declarative/focus/Core/ListViews.qml
index 089f821..32a5d4c 100644
--- a/examples/declarative/focus/Core/ListViews.qml
+++ b/examples/declarative/focus/Core/ListViews.qml
@@ -14,7 +14,7 @@ FocusScope {
         delegate: ListViewDelegate {}
 
         Behavior on y {
-            NumberAnimation { duration: 600; easing.type: "OutQuint" }
+            NumberAnimation { duration: 600; easing.type: Easing.OutQuint }
         }
     }
 
@@ -26,7 +26,7 @@ FocusScope {
         delegate: ListViewDelegate {}
 
         Behavior on y {
-            NumberAnimation { duration: 600; easing.type: "OutQuint" }
+            NumberAnimation { duration: 600; easing.type: Easing.OutQuint }
         }
     }
 
@@ -38,7 +38,7 @@ FocusScope {
         delegate: ListViewDelegate {}
 
         Behavior on y {
-            NumberAnimation { duration: 600; easing.type: "OutQuint" }
+            NumberAnimation { duration: 600; easing.type: Easing.OutQuint }
         }
     }
 
diff --git a/examples/declarative/focus/focus.qml b/examples/declarative/focus/focus.qml
index 22b0e50..8c992ae 100644
--- a/examples/declarative/focus/focus.qml
+++ b/examples/declarative/focus/focus.qml
@@ -38,7 +38,7 @@ Rectangle {
         }
 
         transitions: Transition {
-            NumberAnimation { properties: "y"; duration: 600; easing.type: "OutQuint" }
+            NumberAnimation { properties: "y"; duration: 600; easing.type: Easing.OutQuint }
         }
     }
 
@@ -64,6 +64,6 @@ Rectangle {
     }
 
     transitions: Transition {
-        NumberAnimation { properties: "x,opacity"; duration: 600; easing.type: "OutQuint" }
+        NumberAnimation { properties: "x,opacity"; duration: 600; easing.type: Easing.OutQuint }
     }
 }
diff --git a/examples/declarative/fonts/hello.qml b/examples/declarative/fonts/hello.qml
index d4d0e4c..0d6f4cd 100644
--- a/examples/declarative/fonts/hello.qml
+++ b/examples/declarative/fonts/hello.qml
@@ -19,7 +19,7 @@ Rectangle {
 
             SequentialAnimation on font.letterSpacing {
                 loops: Animation.Infinite;
-                NumberAnimation { from: 100; to: 300; easing.type: "InQuad"; duration: 3000 }
+                NumberAnimation { from: 100; to: 300; easing.type: Easing.InQuad; duration: 3000 }
                 ScriptAction {
                     script: {
                         container.y = (screen.height / 4) + (Math.random() * screen.height / 2)
diff --git a/examples/declarative/layouts/Button.qml b/examples/declarative/layouts/Button.qml
index 0f08893..d03eeb5 100644
--- a/examples/declarative/layouts/Button.qml
+++ b/examples/declarative/layouts/Button.qml
@@ -1,22 +1,38 @@
 import Qt 4.7
 
-Rectangle { border.color: "black"; color: "steelblue"; radius: 5; width: pix.width + textelement.width + 13; height: pix.height + 10; id: page
+Rectangle {
+    id: page
+
     property string text
     property string icon
     signal clicked
 
-    Image { id: pix; x: 5; y:5; source: parent.icon}
-    Text { id: textelement; text: page.text; color: "white"; x:pix.width+pix.x+3; anchors.verticalCenter: pix.verticalCenter;}
-    MouseArea{ id:mr; anchors.fill: parent; onClicked: {parent.focus = true; page.clicked()}}
+    border.color: "black"; color: "steelblue"; radius: 5
+    width: pix.width + textelement.width + 13
+    height: pix.height + 10
+
+    Image { id: pix; x: 5; y:5; source: parent.icon }
+
+    Text {
+        id: textelement
+        text: page.text; color: "white"
+        x: pix.width + pix.x + 3
+        anchors.verticalCenter: pix.verticalCenter
+    }
+
+    MouseArea {
+        id: mr
+        anchors.fill: parent
+        onClicked: { parent.focus = true; page.clicked() }
+    }
 
-    states:
-        State{ name:"pressed"; when:mr.pressed
-            PropertyChanges {target:textelement; x: 5}
-            PropertyChanges {target:pix; x:textelement.x+textelement.width + 3}
-        }
+    states: State {
+        name: "pressed"; when: mr.pressed
+        PropertyChanges { target: textelement; x: 5 }
+        PropertyChanges { target: pix; x: textelement.x + textelement.width + 3 }
+    }
 
-    transitions:
-        Transition{
-            NumberAnimation { properties:"x,left"; easing.type:"InOutQuad"; duration:200 }
-        }
+    transitions: Transition {
+        NumberAnimation { properties: "x,left"; easing.type: Easing.InOutQuad; duration: 200 }
+    }
 }
diff --git a/examples/declarative/layouts/positioners.qml b/examples/declarative/layouts/positioners.qml
index 3703b59..2cb0b8b 100644
--- a/examples/declarative/layouts/positioners.qml
+++ b/examples/declarative/layouts/positioners.qml
@@ -8,10 +8,10 @@ Rectangle {
         id: layout1
         y: 0
         move: Transition {
-            NumberAnimation { properties: "y"; easing.type: "OutBounce" }
+            NumberAnimation { properties: "y"; easing.type: Easing.OutBounce }
         }
         add: Transition {
-            NumberAnimation { properties: "y"; easing.type: "OutQuad" }
+            NumberAnimation { properties: "y"; easing.type: Easing.OutQuad }
         }
 
         Rectangle { color: "red"; width: 100; height: 50; border.color: "black"; radius: 15 }
@@ -43,10 +43,10 @@ Rectangle {
         id: layout2
         y: 300 
         move: Transition {
-            NumberAnimation { properties: "x"; easing.type: "OutBounce" }
+            NumberAnimation { properties: "x"; easing.type: Easing.OutBounce }
         }
         add: Transition {
-            NumberAnimation { properties: "x"; easing.type: "OutQuad" }
+            NumberAnimation { properties: "x"; easing.type: Easing.OutQuad }
         }
 
         Rectangle { color: "red"; width: 50; height: 100; border.color: "black"; radius: 15 }
@@ -117,11 +117,11 @@ Rectangle {
         columns: 3
 
         move: Transition {
-            NumberAnimation { properties: "x,y"; easing.type: "OutBounce" }
+            NumberAnimation { properties: "x,y"; easing.type: Easing.OutBounce }
         }
 
         add: Transition {
-            NumberAnimation { properties: "x,y"; easing.type: "OutBounce" }
+            NumberAnimation { properties: "x,y"; easing.type: Easing.OutBounce }
         }
 
         Rectangle { color: "red"; width: 50; height: 50; border.color: "black"; radius: 15 }
@@ -167,11 +167,11 @@ Rectangle {
         x: 260; y: 250; width: 150
 
         move: Transition {
-            NumberAnimation { properties: "x,y"; easing.type: "OutBounce" }
+            NumberAnimation { properties: "x,y"; easing.type: Easing.OutBounce }
         }
 
         add: Transition {
-            NumberAnimation { properties: "x,y"; easing.type: "OutBounce" }
+            NumberAnimation { properties: "x,y"; easing.type: Easing.OutBounce }
         }
 
         Rectangle { color: "red"; width: 50; height: 50; border.color: "black"; radius: 15 }
diff --git a/examples/declarative/parallax/qml/Smiley.qml b/examples/declarative/parallax/qml/Smiley.qml
index b1e1ae8..cfa4fed 100644
--- a/examples/declarative/parallax/qml/Smiley.qml
+++ b/examples/declarative/parallax/qml/Smiley.qml
@@ -30,13 +30,13 @@ Item {
             // Move from minHeight to maxHeight in 300ms, using the OutExpo easing function
             NumberAnimation {
                 from: smiley.minHeight; to: smiley.maxHeight
-                easing.type: "OutExpo"; duration: 300
+                easing.type: Easing.OutExpo; duration: 300
             }
             
             // Then move back to minHeight in 1 second, using the OutBounce easing function
             NumberAnimation {
                 from: smiley.maxHeight; to: smiley.minHeight
-                easing.type: "OutBounce"; duration: 1000
+                easing.type: Easing.OutBounce; duration: 1000
             }
 
             // Then pause for 500ms
diff --git a/examples/declarative/proxywidgets/proxywidgets.qml b/examples/declarative/proxywidgets/proxywidgets.qml
index 46dcf99..88de37f 100644
--- a/examples/declarative/proxywidgets/proxywidgets.qml
+++ b/examples/declarative/proxywidgets/proxywidgets.qml
@@ -63,7 +63,7 @@ Rectangle {
 
     transitions: Transition {
         ParallelAnimation {
-            NumberAnimation { properties: "x,y,rotation"; duration: 600; easing.type: "OutQuad" }
+            NumberAnimation { properties: "x,y,rotation"; duration: 600; easing.type: Easing.OutQuad }
             ColorAnimation { target: window; duration: 600 }
         }
     }
diff --git a/examples/declarative/slideswitch/content/Switch.qml b/examples/declarative/slideswitch/content/Switch.qml
index a8fa6ef..1aa7696 100644
--- a/examples/declarative/slideswitch/content/Switch.qml
+++ b/examples/declarative/slideswitch/content/Switch.qml
@@ -69,7 +69,7 @@ Item {
 
 //![7]
     transitions: Transition {
-        NumberAnimation { properties: "x"; easing.type: "InOutQuad"; duration: 200 }
+        NumberAnimation { properties: "x"; easing.type: Easing.InOutQuad; duration: 200 }
     }
 //![7]
 }
diff --git a/examples/declarative/states/transitions.qml b/examples/declarative/states/transitions.qml
index d1b1dd6..ccc7060 100644
--- a/examples/declarative/states/transitions.qml
+++ b/examples/declarative/states/transitions.qml
@@ -72,14 +72,14 @@ Rectangle {
         // with OutBounce easing function.
         Transition {
             from: "*"; to: "middleRight"
-            NumberAnimation { properties: "x,y"; easing.type: "OutBounce"; duration: 1000 }
+            NumberAnimation { properties: "x,y"; easing.type: Easing.OutBounce; duration: 1000 }
         },
 
         // When transitioning to 'bottomLeft' move x,y over a duration of 2 seconds,
         // with InOutQuad easing function.
         Transition {
             from: "*"; to: "bottomLeft"
-            NumberAnimation { properties: "x,y"; easing.type: "InOutQuad"; duration: 2000 }
+            NumberAnimation { properties: "x,y"; easing.type: Easing.InOutQuad; duration: 2000 }
         },
 
         // For any other state changes move x,y linearly over duration of 200ms.
diff --git a/examples/declarative/tutorials/helloworld/tutorial3.qml b/examples/declarative/tutorials/helloworld/tutorial3.qml
index 041d9a9..0da762c 100644
--- a/examples/declarative/tutorials/helloworld/tutorial3.qml
+++ b/examples/declarative/tutorials/helloworld/tutorial3.qml
@@ -28,7 +28,7 @@ Rectangle {
         transitions: Transition {
             from: ""; to: "down"; reversible: true
             ParallelAnimation {
-                NumberAnimation { properties: "y,rotation"; duration: 500; easing.type: "InOutQuad" }
+                NumberAnimation { properties: "y,rotation"; duration: 500; easing.type: Easing.InOutQuad }
                 ColorAnimation { duration: 500 }
             }
         }
diff --git a/examples/declarative/xmldata/yahoonews.qml b/examples/declarative/xmldata/yahoonews.qml
index 668778e..5bab463 100644
--- a/examples/declarative/xmldata/yahoonews.qml
+++ b/examples/declarative/xmldata/yahoonews.qml
@@ -65,7 +65,7 @@ Rectangle {
                 transitions: Transition {
                     from: "*"; to: "Details"; reversible: true
                     SequentialAnimation {
-                        NumberAnimation { duration: 200; properties: "height"; easing.type: "OutQuad" }
+                        NumberAnimation { duration: 200; properties: "height"; easing.type: Easing.OutQuad }
                         NumberAnimation { duration: 200; properties: "opacity" }
                     }
                 }
diff --git a/src/declarative/graphicsitems/qdeclarativegridview.cpp b/src/declarative/graphicsitems/qdeclarativegridview.cpp
index 4c72482..9ae7279 100644
--- a/src/declarative/graphicsitems/qdeclarativegridview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativegridview.cpp
@@ -964,7 +964,7 @@ QDeclarativeGridView::~QDeclarativeGridView()
             id: wrapper
             GridView.onRemove: SequentialAnimation {
                 PropertyAction { target: wrapper; property: "GridView.delayRemove"; value: true }
-                NumberAnimation { target: wrapper; property: "scale"; to: 0; duration: 250; easing.type: "InOutQuad" }
+                NumberAnimation { target: wrapper; property: "scale"; to: 0; duration: 250; easing.type: Easing.InOutQuad }
                 PropertyAction { target: wrapper; property: "GridView.delayRemove"; value: false }
             }
         }
diff --git a/src/declarative/graphicsitems/qdeclarativelistview.cpp b/src/declarative/graphicsitems/qdeclarativelistview.cpp
index 3877fab..cef7e18 100644
--- a/src/declarative/graphicsitems/qdeclarativelistview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativelistview.cpp
@@ -1395,7 +1395,7 @@ QDeclarativeListView::~QDeclarativeListView()
             id: wrapper
             ListView.onRemove: SequentialAnimation {
                 PropertyAction { target: wrapper; property: "ListView.delayRemove"; value: true }
-                NumberAnimation { target: wrapper; property: "scale"; to: 0; duration: 250; easing.type: "InOutQuad" }
+                NumberAnimation { target: wrapper; property: "scale"; to: 0; duration: 250; easing.type: Easing.InOutQuad }
                 PropertyAction { target: wrapper; property: "ListView.delayRemove"; value: false }
             }
         }
diff --git a/src/declarative/graphicsitems/qdeclarativepositioners.cpp b/src/declarative/graphicsitems/qdeclarativepositioners.cpp
index 206b09d..93bff3e 100644
--- a/src/declarative/graphicsitems/qdeclarativepositioners.cpp
+++ b/src/declarative/graphicsitems/qdeclarativepositioners.cpp
@@ -377,7 +377,7 @@ Column {
     move: Transition {
         NumberAnimation {
             properties: "y"
-            easing.type: "OutBounce"
+            easing.type: Easing.OutBounce
         }
     }
 }
diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp
index 9f95348..7f4d2e4 100644
--- a/src/declarative/util/qdeclarativeanimation.cpp
+++ b/src/declarative/util/qdeclarativeanimation.cpp
@@ -1615,7 +1615,7 @@ void QDeclarativePropertyAnimationPrivate::convertVariant(QVariant &variant, int
     Animate any objects that have changed their x or y properties in the target state using
     an InOutQuad easing curve:
     \qml
-    Transition { PropertyAnimation { properties: "x,y"; easing.type: "InOutQuad" } }
+    Transition { PropertyAnimation { properties: "x,y"; easing.type: Easing.InOutQuad } }
     \endqml
     \o In a Behavior
 
diff --git a/src/declarative/util/qdeclarativebehavior.cpp b/src/declarative/util/qdeclarativebehavior.cpp
index 90344ab..ba90007 100644
--- a/src/declarative/util/qdeclarativebehavior.cpp
+++ b/src/declarative/util/qdeclarativebehavior.cpp
@@ -82,7 +82,7 @@ public:
         y: 200  // initial value
         Behavior on y {
             NumberAnimation {
-                easing.type: "OutBounce"
+                easing.type: Easing.OutBounce
                 easing.amplitude: 100
                 duration: 200
             }
diff --git a/src/declarative/util/qdeclarativespringfollow.cpp b/src/declarative/util/qdeclarativespringfollow.cpp
index 70077f3..aae66ac 100644
--- a/src/declarative/util/qdeclarativespringfollow.cpp
+++ b/src/declarative/util/qdeclarativespringfollow.cpp
@@ -227,7 +227,7 @@ void QDeclarativeSpringFollowPrivate::stop()
             loops: Animation.Infinite
             NumberAnimation {
                 to: 200
-                easing.type: "OutBounce"
+                easing.type: Easing.OutBounce
                 easing.amplitude: 100
                 duration: 2000
             }
-- 
cgit v0.12


From ab030e931e05a060b4f6fabf4235f05aeb0c252c Mon Sep 17 00:00:00 2001
From: Martin Jones 
Date: Wed, 5 May 2010 16:39:05 +1000
Subject: Fix cacheBuffer documentation.

Task-number: QTBUG-10385
---
 .../graphicsitems/qdeclarativegridview.cpp           | 20 ++++++++++++++------
 .../graphicsitems/qdeclarativelistview.cpp           | 18 +++++++++++++-----
 src/declarative/util/qdeclarativeanimation.cpp       |  2 +-
 3 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/src/declarative/graphicsitems/qdeclarativegridview.cpp b/src/declarative/graphicsitems/qdeclarativegridview.cpp
index 4c72482..528cb22 100644
--- a/src/declarative/graphicsitems/qdeclarativegridview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativegridview.cpp
@@ -1405,12 +1405,20 @@ void QDeclarativeGridView::setWrapEnabled(bool wrap)
 }
 
 /*!
-  \qmlproperty int GridView::cacheBuffer
-  This property holds the number of off-screen pixels to cache.
-
-  This property determines the number of pixels above the top of the view
-  and below the bottom of the view to cache.  Setting this value can make
-  scrolling the view smoother at the expense of additional memory usage.
+    \qmlproperty int GridView::cacheBuffer
+    This property determines whether delegates are retained outside the
+    visible area of the view.
+
+    If non-zero the view will keep as many delegates
+    instantiated as will fit within the buffer specified.  For example,
+    if in a vertical view the delegate is 20 pixels high and \c cacheBuffer is
+    set to 40, then up to 2 delegates above and 2 delegates below the visible
+    area may be retained.
+
+    Setting this value can make scrolling the list smoother at the expense
+    of additional memory usage.  It is not a substitute for creating efficient
+    delegates; the fewer elements in a delegate, the faster a view may be
+    scrolled.
 */
 int QDeclarativeGridView::cacheBuffer() const
 {
diff --git a/src/declarative/graphicsitems/qdeclarativelistview.cpp b/src/declarative/graphicsitems/qdeclarativelistview.cpp
index 3877fab..75cf547 100644
--- a/src/declarative/graphicsitems/qdeclarativelistview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativelistview.cpp
@@ -1839,11 +1839,19 @@ void QDeclarativeListView::setWrapEnabled(bool wrap)
 
 /*!
     \qmlproperty int ListView::cacheBuffer
-    This property holds the number of off-screen pixels to cache.
-
-    This property determines the number of pixels above the top of the list
-    and below the bottom of the list to cache.  Setting this value can make
-    scrolling the list smoother at the expense of additional memory usage.
+    This property determines whether delegates are retained outside the
+    visible area of the view.
+
+    If non-zero the view will keep as many delegates
+    instantiated as will fit within the buffer specified.  For example,
+    if in a vertical view the delegate is 20 pixels high and \c cacheBuffer is
+    set to 40, then up to 2 delegates above and 2 delegates below the visible
+    area may be retained.
+
+    Setting this value can make scrolling the list smoother at the expense
+    of additional memory usage.  It is not a substitute for creating efficient
+    delegates; the fewer elements in a delegate, the faster a view may be
+    scrolled.
 */
 int QDeclarativeListView::cacheBuffer() const
 {
diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp
index 9f95348..5b2954b 100644
--- a/src/declarative/util/qdeclarativeanimation.cpp
+++ b/src/declarative/util/qdeclarativeanimation.cpp
@@ -874,7 +874,7 @@ void QDeclarativePropertyActionPrivate::init()
     This property holds an explicit target object to animate.
 
     The exact effect of the \c target property depends on how the animation
-    is being used.  Refer to the \l animation documentation for details.
+    is being used.  Refer to the \l {QML Animation} documentation for details.
 */
 
 QObject *QDeclarativePropertyAction::target() const
-- 
cgit v0.12


From 238ed995be8f32e815ffb6883144d0547355a8eb Mon Sep 17 00:00:00 2001
From: Alan Alpert 
Date: Tue, 4 May 2010 14:14:46 +0200
Subject: Move Qt.widgets import to be an unsupported example

Layout examples for QML are also cleaned up a bit.
Layouts test removed, and LayoutItem test added, to clarify what we
support.

Reviewed-by: Michael Brasser
---
 examples/declarative/layouts/Button.qml            |  22 --
 examples/declarative/layouts/add.png               | Bin 1577 -> 0 bytes
 examples/declarative/layouts/del.png               | Bin 1661 -> 0 bytes
 .../layouts/graphicsLayouts/graphicslayouts.cpp    | 366 +++++++++++++++++++++
 .../layouts/graphicsLayouts/graphicslayouts.pro    |  13 +
 .../layouts/graphicsLayouts/graphicslayouts.qml    |  77 +++++
 .../layouts/graphicsLayouts/graphicslayouts.qrc    |   5 +
 .../layouts/graphicsLayouts/graphicslayouts_p.h    | 303 +++++++++++++++++
 .../declarative/layouts/graphicsLayouts/main.cpp   |  60 ++++
 .../declarative/layouts/layoutItem/layoutItem.pro  |  13 +
 .../declarative/layouts/layoutItem/layoutItem.qml  |  16 +
 .../declarative/layouts/layoutItem/layoutItem.qrc  |   5 +
 examples/declarative/layouts/layoutItem/main.cpp   |  73 ++++
 examples/declarative/layouts/layouts.qml           |  29 --
 examples/declarative/layouts/layouts.qmlproject    |  16 -
 examples/declarative/layouts/positioners.qml       | 213 ------------
 .../declarative/layouts/positioners/Button.qml     |  22 ++
 examples/declarative/layouts/positioners/add.png   | Bin 0 -> 1577 bytes
 examples/declarative/layouts/positioners/del.png   | Bin 0 -> 1661 bytes
 .../layouts/positioners/positioners.qml            | 213 ++++++++++++
 .../layouts/positioners/positioners.qmlproject     |  18 +
 .../positioners/positioners.qmlproject.user        |  41 +++
 src/imports/imports.pro                            |   2 +-
 src/imports/widgets/graphicslayouts.cpp            | 366 ---------------------
 src/imports/widgets/graphicslayouts_p.h            | 303 -----------------
 src/imports/widgets/qmldir                         |   1 -
 src/imports/widgets/widgets.cpp                    |  71 ----
 src/imports/widgets/widgets.pro                    |  30 --
 .../qdeclarativelayoutitem/data/layoutItem.qml     |   9 +
 .../qdeclarativelayoutitem.pro                     |   8 +
 .../tst_qdeclarativelayoutitem.cpp                 | 115 +++++++
 .../qdeclarativelayouts/data/layouts.qml           |  31 --
 .../qdeclarativelayouts/qdeclarativelayouts.pro    |  10 -
 .../tst_qdeclarativelayouts.cpp                    | 147 ---------
 34 files changed, 1358 insertions(+), 1240 deletions(-)
 delete mode 100644 examples/declarative/layouts/Button.qml
 delete mode 100644 examples/declarative/layouts/add.png
 delete mode 100644 examples/declarative/layouts/del.png
 create mode 100644 examples/declarative/layouts/graphicsLayouts/graphicslayouts.cpp
 create mode 100644 examples/declarative/layouts/graphicsLayouts/graphicslayouts.pro
 create mode 100644 examples/declarative/layouts/graphicsLayouts/graphicslayouts.qml
 create mode 100644 examples/declarative/layouts/graphicsLayouts/graphicslayouts.qrc
 create mode 100644 examples/declarative/layouts/graphicsLayouts/graphicslayouts_p.h
 create mode 100644 examples/declarative/layouts/graphicsLayouts/main.cpp
 create mode 100644 examples/declarative/layouts/layoutItem/layoutItem.pro
 create mode 100644 examples/declarative/layouts/layoutItem/layoutItem.qml
 create mode 100644 examples/declarative/layouts/layoutItem/layoutItem.qrc
 create mode 100644 examples/declarative/layouts/layoutItem/main.cpp
 delete mode 100644 examples/declarative/layouts/layouts.qml
 delete mode 100644 examples/declarative/layouts/layouts.qmlproject
 delete mode 100644 examples/declarative/layouts/positioners.qml
 create mode 100644 examples/declarative/layouts/positioners/Button.qml
 create mode 100644 examples/declarative/layouts/positioners/add.png
 create mode 100644 examples/declarative/layouts/positioners/del.png
 create mode 100644 examples/declarative/layouts/positioners/positioners.qml
 create mode 100644 examples/declarative/layouts/positioners/positioners.qmlproject
 create mode 100644 examples/declarative/layouts/positioners/positioners.qmlproject.user
 delete mode 100644 src/imports/widgets/graphicslayouts.cpp
 delete mode 100644 src/imports/widgets/graphicslayouts_p.h
 delete mode 100644 src/imports/widgets/qmldir
 delete mode 100644 src/imports/widgets/widgets.cpp
 delete mode 100644 src/imports/widgets/widgets.pro
 create mode 100644 tests/auto/declarative/qdeclarativelayoutitem/data/layoutItem.qml
 create mode 100644 tests/auto/declarative/qdeclarativelayoutitem/qdeclarativelayoutitem.pro
 create mode 100644 tests/auto/declarative/qdeclarativelayoutitem/tst_qdeclarativelayoutitem.cpp
 delete mode 100644 tests/auto/declarative/qdeclarativelayouts/data/layouts.qml
 delete mode 100644 tests/auto/declarative/qdeclarativelayouts/qdeclarativelayouts.pro
 delete mode 100644 tests/auto/declarative/qdeclarativelayouts/tst_qdeclarativelayouts.cpp

diff --git a/examples/declarative/layouts/Button.qml b/examples/declarative/layouts/Button.qml
deleted file mode 100644
index 0f08893..0000000
--- a/examples/declarative/layouts/Button.qml
+++ /dev/null
@@ -1,22 +0,0 @@
-import Qt 4.7
-
-Rectangle { border.color: "black"; color: "steelblue"; radius: 5; width: pix.width + textelement.width + 13; height: pix.height + 10; id: page
-    property string text
-    property string icon
-    signal clicked
-
-    Image { id: pix; x: 5; y:5; source: parent.icon}
-    Text { id: textelement; text: page.text; color: "white"; x:pix.width+pix.x+3; anchors.verticalCenter: pix.verticalCenter;}
-    MouseArea{ id:mr; anchors.fill: parent; onClicked: {parent.focus = true; page.clicked()}}
-
-    states:
-        State{ name:"pressed"; when:mr.pressed
-            PropertyChanges {target:textelement; x: 5}
-            PropertyChanges {target:pix; x:textelement.x+textelement.width + 3}
-        }
-
-    transitions:
-        Transition{
-            NumberAnimation { properties:"x,left"; easing.type:"InOutQuad"; duration:200 }
-        }
-}
diff --git a/examples/declarative/layouts/add.png b/examples/declarative/layouts/add.png
deleted file mode 100644
index f29d84b..0000000
Binary files a/examples/declarative/layouts/add.png and /dev/null differ
diff --git a/examples/declarative/layouts/del.png b/examples/declarative/layouts/del.png
deleted file mode 100644
index 1d753a3..0000000
Binary files a/examples/declarative/layouts/del.png and /dev/null differ
diff --git a/examples/declarative/layouts/graphicsLayouts/graphicslayouts.cpp b/examples/declarative/layouts/graphicsLayouts/graphicslayouts.cpp
new file mode 100644
index 0000000..25cf994
--- /dev/null
+++ b/examples/declarative/layouts/graphicsLayouts/graphicslayouts.cpp
@@ -0,0 +1,366 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "graphicslayouts_p.h"
+
+#include 
+#include 
+
+QT_BEGIN_NAMESPACE
+
+LinearLayoutAttached::LinearLayoutAttached(QObject *parent)
+: QObject(parent), _stretch(1), _alignment(Qt::AlignCenter), _spacing(0)
+{
+}
+
+void LinearLayoutAttached::setStretchFactor(int f)
+{
+    if (_stretch == f)
+        return;
+
+    _stretch = f;
+    emit stretchChanged(reinterpret_cast(parent()), _stretch);
+}
+
+void LinearLayoutAttached::setSpacing(int s)
+{
+    if (_spacing == s)
+        return;
+
+    _spacing = s;
+    emit spacingChanged(reinterpret_cast(parent()), _spacing);
+}
+
+void LinearLayoutAttached::setAlignment(Qt::Alignment a)
+{
+    if (_alignment == a)
+        return;
+
+    _alignment = a;
+    emit alignmentChanged(reinterpret_cast(parent()), _alignment);
+}
+
+QGraphicsLinearLayoutStretchItemObject::QGraphicsLinearLayoutStretchItemObject(QObject *parent)
+    : QObject(parent)
+{
+}
+
+QSizeF QGraphicsLinearLayoutStretchItemObject::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
+{
+Q_UNUSED(which);
+Q_UNUSED(constraint);
+return QSizeF();
+}
+
+
+QGraphicsLinearLayoutObject::QGraphicsLinearLayoutObject(QObject *parent)
+: QObject(parent)
+{
+}
+
+QGraphicsLinearLayoutObject::~QGraphicsLinearLayoutObject()
+{
+}
+
+void QGraphicsLinearLayoutObject::insertLayoutItem(int index, QGraphicsLayoutItem *item)
+{
+insertItem(index, item);
+
+//connect attached properties
+if (LinearLayoutAttached *obj = attachedProperties.value(item)) {
+    setStretchFactor(item, obj->stretchFactor());
+    setAlignment(item, obj->alignment());
+    updateSpacing(item, obj->spacing());
+    QObject::connect(obj, SIGNAL(stretchChanged(QGraphicsLayoutItem*,int)),
+                     this, SLOT(updateStretch(QGraphicsLayoutItem*,int)));
+    QObject::connect(obj, SIGNAL(alignmentChanged(QGraphicsLayoutItem*,Qt::Alignment)),
+                     this, SLOT(updateAlignment(QGraphicsLayoutItem*,Qt::Alignment)));
+    QObject::connect(obj, SIGNAL(spacingChanged(QGraphicsLayoutItem*,int)),
+                     this, SLOT(updateSpacing(QGraphicsLayoutItem*,int)));
+    //### need to disconnect when widget is removed?
+}
+}
+
+//### is there a better way to do this?
+void QGraphicsLinearLayoutObject::clearChildren()
+{
+for (int i = 0; i < count(); ++i)
+    removeAt(i);
+}
+
+qreal QGraphicsLinearLayoutObject::contentsMargin() const
+{
+    qreal a,b,c,d;
+    getContentsMargins(&a, &b, &c, &d);
+    if(a==b && a==c && a==d)
+        return a;
+    return -1;
+}
+
+void QGraphicsLinearLayoutObject::setContentsMargin(qreal m)
+{
+    setContentsMargins(m,m,m,m);
+}
+
+void QGraphicsLinearLayoutObject::updateStretch(QGraphicsLayoutItem *item, int stretch)
+{
+QGraphicsLinearLayout::setStretchFactor(item, stretch);
+}
+
+void QGraphicsLinearLayoutObject::updateSpacing(QGraphicsLayoutItem* item, int spacing)
+{
+    for(int i=0; i < count(); i++){
+        if(itemAt(i) == item){ //I do not see the reverse function, which is why we must loop over all items
+            QGraphicsLinearLayout::setItemSpacing(i, spacing);
+            return;
+        }
+    }
+}
+
+void QGraphicsLinearLayoutObject::updateAlignment(QGraphicsLayoutItem *item, Qt::Alignment alignment)
+{
+QGraphicsLinearLayout::setAlignment(item, alignment);
+}
+
+QHash QGraphicsLinearLayoutObject::attachedProperties;
+LinearLayoutAttached *QGraphicsLinearLayoutObject::qmlAttachedProperties(QObject *obj)
+{
+// ### This is not allowed - you must attach to any object
+if (!qobject_cast(obj))
+    return 0;
+LinearLayoutAttached *rv = new LinearLayoutAttached(obj);
+attachedProperties.insert(qobject_cast(obj), rv);
+return rv;
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////////////////
+// QGraphicsGridLayout-related classes
+//////////////////////////////////////////////////////////////////////////////////////////////////////
+GridLayoutAttached::GridLayoutAttached(QObject *parent)
+: QObject(parent), _row(-1), _column(-1), _rowspan(1), _colspan(1), _alignment(-1), _rowstretch(-1),
+    _colstretch(-1), _rowspacing(-1), _colspacing(-1), _rowprefheight(-1), _rowmaxheight(-1), _rowminheight(-1),
+    _rowfixheight(-1), _colprefwidth(-1), _colmaxwidth(-1), _colminwidth(-1), _colfixwidth(-1)
+{
+}
+
+void GridLayoutAttached::setRow(int r)
+{
+    if (_row == r)
+        return;
+
+    _row = r;
+    //emit rowChanged(reinterpret_cast(parent()), _row);
+}
+
+void GridLayoutAttached::setColumn(int c)
+{
+    if (_column == c)
+        return;
+
+    _column = c;
+    //emit columnChanged(reinterpret_cast(parent()), _column);
+}
+
+void GridLayoutAttached::setRowSpan(int rs)
+{
+    if (_rowspan == rs)
+        return;
+
+    _rowspan = rs;
+    //emit rowSpanChanged(reinterpret_cast(parent()), _rowSpan);
+}
+
+void GridLayoutAttached::setColumnSpan(int cs)
+{
+    if (_colspan == cs)
+        return;
+
+    _colspan = cs;
+    //emit columnSpanChanged(reinterpret_cast(parent()), _columnSpan);
+}
+
+void GridLayoutAttached::setAlignment(Qt::Alignment a)
+{
+    if (_alignment == a)
+        return;
+
+    _alignment = a;
+    emit alignmentChanged(reinterpret_cast(parent()), _alignment);
+}
+
+void GridLayoutAttached::setRowStretchFactor(int f)
+{
+    _rowstretch = f;
+}
+
+void GridLayoutAttached::setColumnStretchFactor(int f)
+{
+    _colstretch = f;
+}
+
+void GridLayoutAttached::setRowSpacing(int s)
+{
+    _rowspacing = s;
+}
+
+void GridLayoutAttached::setColumnSpacing(int s)
+{
+    _colspacing = s;
+}
+
+
+QGraphicsGridLayoutObject::QGraphicsGridLayoutObject(QObject *parent)
+: QObject(parent)
+{
+}
+
+QGraphicsGridLayoutObject::~QGraphicsGridLayoutObject()
+{
+}
+
+void QGraphicsGridLayoutObject::addWidget(QGraphicsWidget *wid)
+{
+//use attached properties
+if (QObject *obj = attachedProperties.value(qobject_cast(wid))) {
+    int row = static_cast(obj)->row();
+    int column = static_cast(obj)->column();
+    int rowSpan = static_cast(obj)->rowSpan();
+    int columnSpan = static_cast(obj)->columnSpan();
+    if (row == -1 || column == -1) {
+        qWarning() << "Must set row and column for an item in a grid layout";
+        return;
+    }
+    addItem(wid, row, column, rowSpan, columnSpan);
+}
+}
+
+void QGraphicsGridLayoutObject::addLayoutItem(QGraphicsLayoutItem *item)
+{
+//use attached properties
+if (GridLayoutAttached *obj = attachedProperties.value(item)) {
+    int row = obj->row();
+    int column = obj->column();
+    int rowSpan = obj->rowSpan();
+    int columnSpan = obj->columnSpan();
+    Qt::Alignment alignment = obj->alignment();
+    if (row == -1 || column == -1) {
+        qWarning() << "Must set row and column for an item in a grid layout";
+        return;
+    }
+    if(obj->rowSpacing() != -1)
+        setRowSpacing(row, obj->rowSpacing());
+    if(obj->columnSpacing() != -1)
+        setColumnSpacing(column, obj->columnSpacing());
+    if(obj->rowStretchFactor() != -1)
+        setRowStretchFactor(row, obj->rowStretchFactor());
+    if(obj->columnStretchFactor() != -1)
+        setColumnStretchFactor(column, obj->columnStretchFactor());
+    if(obj->rowPreferredHeight() != -1)
+        setRowPreferredHeight(row, obj->rowPreferredHeight());
+    if(obj->rowMaximumHeight() != -1)
+        setRowMaximumHeight(row, obj->rowMaximumHeight());
+    if(obj->rowMinimumHeight() != -1)
+        setRowMinimumHeight(row, obj->rowMinimumHeight());
+    if(obj->rowFixedHeight() != -1)
+        setRowFixedHeight(row, obj->rowFixedHeight());
+    if(obj->columnPreferredWidth() != -1)
+        setColumnPreferredWidth(row, obj->columnPreferredWidth());
+    if(obj->columnMaximumWidth() != -1)
+        setColumnMaximumWidth(row, obj->columnMaximumWidth());
+    if(obj->columnMinimumWidth() != -1)
+        setColumnMinimumWidth(row, obj->columnMinimumWidth());
+    if(obj->columnFixedWidth() != -1)
+        setColumnFixedWidth(row, obj->columnFixedWidth());
+    addItem(item, row, column, rowSpan, columnSpan);
+    if (alignment != -1)
+        setAlignment(item,alignment);
+    QObject::connect(obj, SIGNAL(alignmentChanged(QGraphicsLayoutItem*,Qt::Alignment)),
+                     this, SLOT(updateAlignment(QGraphicsLayoutItem*,Qt::Alignment)));
+    //### need to disconnect when widget is removed?
+}
+}
+
+//### is there a better way to do this?
+void QGraphicsGridLayoutObject::clearChildren()
+{
+for (int i = 0; i < count(); ++i)
+    removeAt(i);
+}
+
+qreal QGraphicsGridLayoutObject::spacing() const
+{
+if (verticalSpacing() == horizontalSpacing())
+    return verticalSpacing();
+return -1;  //###
+}
+
+qreal QGraphicsGridLayoutObject::contentsMargin() const
+{
+    qreal a,b,c,d;
+    getContentsMargins(&a, &b, &c, &d);
+    if(a==b && a==c && a==d)
+        return a;
+    return -1;
+}
+
+void QGraphicsGridLayoutObject::setContentsMargin(qreal m)
+{
+    setContentsMargins(m,m,m,m);
+}
+
+
+void QGraphicsGridLayoutObject::updateAlignment(QGraphicsLayoutItem *item, Qt::Alignment alignment)
+{
+QGraphicsGridLayout::setAlignment(item, alignment);
+}
+
+QHash QGraphicsGridLayoutObject::attachedProperties;
+GridLayoutAttached *QGraphicsGridLayoutObject::qmlAttachedProperties(QObject *obj)
+{
+// ### This is not allowed - you must attach to any object
+if (!qobject_cast(obj))
+    return 0;
+GridLayoutAttached *rv = new GridLayoutAttached(obj);
+attachedProperties.insert(qobject_cast(obj), rv);
+return rv;
+}
+
+QT_END_NAMESPACE
diff --git a/examples/declarative/layouts/graphicsLayouts/graphicslayouts.pro b/examples/declarative/layouts/graphicsLayouts/graphicslayouts.pro
new file mode 100644
index 0000000..e5d91b2
--- /dev/null
+++ b/examples/declarative/layouts/graphicsLayouts/graphicslayouts.pro
@@ -0,0 +1,13 @@
+TEMPLATE = app
+TARGET  = graphicslayouts
+QT += declarative
+
+SOURCES += \
+    graphicslayouts.cpp \
+    main.cpp
+
+HEADERS += \
+    graphicslayouts_p.h
+
+RESOURCES += \
+    graphicslayouts.qrc
diff --git a/examples/declarative/layouts/graphicsLayouts/graphicslayouts.qml b/examples/declarative/layouts/graphicsLayouts/graphicslayouts.qml
new file mode 100644
index 0000000..fcd78d5
--- /dev/null
+++ b/examples/declarative/layouts/graphicsLayouts/graphicslayouts.qml
@@ -0,0 +1,77 @@
+import Qt 4.7
+import GraphicsLayouts 4.7
+
+Item {
+    id: resizable
+
+    width: 800
+    height: 400
+
+    QGraphicsWidget {
+        size.width: parent.width/2
+        size.height: parent.height
+
+        layout: QGraphicsLinearLayout {
+            LayoutItem {
+                minimumSize: "100x100"
+                maximumSize: "300x300"
+                preferredSize: "100x100"
+                Rectangle { color: "yellow"; anchors.fill: parent }
+            }
+            LayoutItem {
+                minimumSize: "100x100"
+                maximumSize: "400x400"
+                preferredSize: "200x200"
+                Rectangle { color: "green"; anchors.fill: parent }
+            }
+        }
+    }
+    QGraphicsWidget {
+        x: parent.width/2
+        size.width: parent.width/2
+        size.height: parent.height
+
+        layout: QGraphicsGridLayout {
+            LayoutItem {
+                QGraphicsGridLayout.row: 0
+                QGraphicsGridLayout.column: 0
+                minimumSize: "100x100"
+                maximumSize: "300x300"
+                preferredSize: "100x100"
+                Rectangle { color: "red"; anchors.fill: parent }
+            }
+            LayoutItem {
+                QGraphicsGridLayout.row: 1
+                QGraphicsGridLayout.column: 0
+                minimumSize: "100x100"
+                maximumSize: "200x200"
+                preferredSize: "100x100"
+                Rectangle { color: "orange"; anchors.fill: parent }
+            }
+            LayoutItem {
+                QGraphicsGridLayout.row: 2
+                QGraphicsGridLayout.column: 0
+                minimumSize: "100x100"
+                maximumSize: "300x300"
+                preferredSize: "200x200"
+                Rectangle { color: "yellow"; anchors.fill: parent }
+            }
+            LayoutItem {
+                QGraphicsGridLayout.row: 0
+                QGraphicsGridLayout.column: 1
+                minimumSize: "100x100"
+                maximumSize: "200x200"
+                preferredSize: "200x200"
+                Rectangle { color: "green"; anchors.fill: parent }
+            }
+            LayoutItem {
+                QGraphicsGridLayout.row: 1
+                QGraphicsGridLayout.column: 1
+                minimumSize: "100x100"
+                maximumSize: "400x400"
+                preferredSize: "200x200"
+                Rectangle { color: "blue"; anchors.fill: parent }
+            }
+        }
+    }
+}
diff --git a/examples/declarative/layouts/graphicsLayouts/graphicslayouts.qrc b/examples/declarative/layouts/graphicsLayouts/graphicslayouts.qrc
new file mode 100644
index 0000000..a199f8d
--- /dev/null
+++ b/examples/declarative/layouts/graphicsLayouts/graphicslayouts.qrc
@@ -0,0 +1,5 @@
+
+
+    graphicslayouts.qml
+
+
diff --git a/examples/declarative/layouts/graphicsLayouts/graphicslayouts_p.h b/examples/declarative/layouts/graphicsLayouts/graphicslayouts_p.h
new file mode 100644
index 0000000..ea9c614
--- /dev/null
+++ b/examples/declarative/layouts/graphicsLayouts/graphicslayouts_p.h
@@ -0,0 +1,303 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef GRAPHICSLAYOUTS_H
+#define GRAPHICSLAYOUTS_H
+
+#include 
+#include 
+#include 
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class QGraphicsLinearLayoutStretchItemObject : public QObject, public QGraphicsLayoutItem
+{
+    Q_OBJECT
+    Q_INTERFACES(QGraphicsLayoutItem)
+public:
+    QGraphicsLinearLayoutStretchItemObject(QObject *parent = 0);
+
+    virtual QSizeF sizeHint(Qt::SizeHint, const QSizeF &) const;
+};
+
+class LinearLayoutAttached;
+class QGraphicsLinearLayoutObject : public QObject, public QGraphicsLinearLayout
+{
+    Q_OBJECT
+    Q_INTERFACES(QGraphicsLayout QGraphicsLayoutItem)
+
+    Q_PROPERTY(QDeclarativeListProperty children READ children)
+    Q_PROPERTY(Qt::Orientation orientation READ orientation WRITE setOrientation)
+    Q_PROPERTY(qreal spacing READ spacing WRITE setSpacing)
+    Q_PROPERTY(qreal contentsMargin READ contentsMargin WRITE setContentsMargin)
+    Q_CLASSINFO("DefaultProperty", "children")
+public:
+    QGraphicsLinearLayoutObject(QObject * = 0);
+    ~QGraphicsLinearLayoutObject();
+
+    QDeclarativeListProperty children() { return QDeclarativeListProperty(this, 0, children_append, children_count, children_at, children_clear); }
+
+    static LinearLayoutAttached *qmlAttachedProperties(QObject *);
+
+    qreal contentsMargin() const;
+    void setContentsMargin(qreal);
+
+private Q_SLOTS:
+    void updateStretch(QGraphicsLayoutItem*,int);
+    void updateSpacing(QGraphicsLayoutItem*,int);
+    void updateAlignment(QGraphicsLayoutItem*,Qt::Alignment);
+
+private:
+    friend class LinearLayoutAttached;
+    void clearChildren();
+    void insertLayoutItem(int, QGraphicsLayoutItem *);
+    static QHash attachedProperties;
+
+    static void children_append(QDeclarativeListProperty *prop, QGraphicsLayoutItem *item) {
+        static_cast(prop->object)->insertLayoutItem(-1, item);
+    }
+
+    static void children_clear(QDeclarativeListProperty *prop) {
+        static_cast(prop->object)->clearChildren();
+    }
+
+    static int children_count(QDeclarativeListProperty *prop) {
+        return static_cast(prop->object)->count();
+    }
+
+    static QGraphicsLayoutItem *children_at(QDeclarativeListProperty *prop, int index) {
+        return static_cast(prop->object)->itemAt(index);
+    }
+};
+
+class GridLayoutAttached;
+class QGraphicsGridLayoutObject : public QObject, public QGraphicsGridLayout
+{
+    Q_OBJECT
+    Q_INTERFACES(QGraphicsLayout QGraphicsLayoutItem)
+
+    Q_PROPERTY(QDeclarativeListProperty children READ children)
+    Q_PROPERTY(qreal spacing READ spacing WRITE setSpacing)
+    Q_PROPERTY(qreal contentsMargin READ contentsMargin WRITE setContentsMargin)
+    Q_PROPERTY(qreal verticalSpacing READ verticalSpacing WRITE setVerticalSpacing)
+    Q_PROPERTY(qreal horizontalSpacing READ horizontalSpacing WRITE setHorizontalSpacing)
+    Q_CLASSINFO("DefaultProperty", "children")
+public:
+    QGraphicsGridLayoutObject(QObject * = 0);
+    ~QGraphicsGridLayoutObject();
+
+    QDeclarativeListProperty children() { return QDeclarativeListProperty(this, 0, children_append, children_count, children_at, children_clear); }
+
+    qreal spacing() const;
+    qreal contentsMargin() const;
+    void setContentsMargin(qreal);
+
+    static GridLayoutAttached *qmlAttachedProperties(QObject *);
+
+private Q_SLOTS:
+    void updateAlignment(QGraphicsLayoutItem*,Qt::Alignment);
+
+private:
+    friend class GraphicsLayoutAttached;
+    void addWidget(QGraphicsWidget *);
+    void clearChildren();
+    void addLayoutItem(QGraphicsLayoutItem *);
+    static QHash attachedProperties;
+
+    static void children_append(QDeclarativeListProperty *prop, QGraphicsLayoutItem *item) {
+        static_cast(prop->object)->addLayoutItem(item);
+    }
+
+    static void children_clear(QDeclarativeListProperty *prop) {
+        static_cast(prop->object)->clearChildren();
+    }
+
+    static int children_count(QDeclarativeListProperty *prop) {
+        return static_cast(prop->object)->count();
+    }
+
+    static QGraphicsLayoutItem *children_at(QDeclarativeListProperty *prop, int index) {
+        return static_cast(prop->object)->itemAt(index);
+    }
+};
+
+class LinearLayoutAttached : public QObject
+{
+    Q_OBJECT
+
+    Q_PROPERTY(int stretchFactor READ stretchFactor WRITE setStretchFactor NOTIFY stretchChanged)
+    Q_PROPERTY(Qt::Alignment alignment READ alignment WRITE setAlignment NOTIFY alignmentChanged)
+    Q_PROPERTY(int spacing READ spacing WRITE setSpacing NOTIFY spacingChanged)
+public:
+    LinearLayoutAttached(QObject *parent);
+
+    int stretchFactor() const { return _stretch; }
+    void setStretchFactor(int f);
+    Qt::Alignment alignment() const { return _alignment; }
+    void setAlignment(Qt::Alignment a);
+    int spacing() const { return _spacing; }
+    void setSpacing(int s);
+
+Q_SIGNALS:
+    void stretchChanged(QGraphicsLayoutItem*,int);
+    void alignmentChanged(QGraphicsLayoutItem*,Qt::Alignment);
+    void spacingChanged(QGraphicsLayoutItem*,int);
+
+private:
+    int _stretch;
+    Qt::Alignment _alignment;
+    int _spacing;
+};
+
+class GridLayoutAttached : public QObject
+{
+    Q_OBJECT
+
+    Q_PROPERTY(int row READ row WRITE setRow)
+    Q_PROPERTY(int column READ column WRITE setColumn)
+    Q_PROPERTY(int rowSpan READ rowSpan WRITE setRowSpan)
+    Q_PROPERTY(int columnSpan READ columnSpan WRITE setColumnSpan)
+    Q_PROPERTY(Qt::Alignment alignment READ alignment WRITE setAlignment)
+    Q_PROPERTY(int rowStretchFactor READ rowStretchFactor WRITE setRowStretchFactor)
+    Q_PROPERTY(int columnStretchFactor READ columnStretchFactor WRITE setColumnStretchFactor)
+    Q_PROPERTY(int rowSpacing READ rowSpacing WRITE setRowSpacing)
+    Q_PROPERTY(int columnSpacing READ columnSpacing WRITE setColumnSpacing)
+    Q_PROPERTY(int rowPreferredHeight READ rowPreferredHeight WRITE setRowPreferredHeight)
+    Q_PROPERTY(int rowMinimumHeight READ rowMinimumHeight WRITE setRowMinimumHeight)
+    Q_PROPERTY(int rowMaximumHeight READ rowMaximumHeight WRITE setRowMaximumHeight)
+    Q_PROPERTY(int rowFixedHeight READ rowFixedHeight WRITE setRowFixedHeight)
+    Q_PROPERTY(int columnPreferredWidth READ columnPreferredWidth WRITE setColumnPreferredWidth)
+    Q_PROPERTY(int columnMaximumWidth READ columnMaximumWidth WRITE setColumnMaximumWidth)
+    Q_PROPERTY(int columnMinimumWidth READ columnMinimumWidth WRITE setColumnMinimumWidth)
+    Q_PROPERTY(int columnFixedWidth READ columnFixedWidth WRITE setColumnFixedWidth)
+
+public:
+    GridLayoutAttached(QObject *parent);
+
+    int row() const { return _row; }
+    void setRow(int r);
+
+    int column() const { return _column; }
+    void setColumn(int c);
+
+    int rowSpan() const { return _rowspan; }
+    void setRowSpan(int rs);
+
+    int columnSpan() const { return _colspan; }
+    void setColumnSpan(int cs);
+
+    Qt::Alignment alignment() const { return _alignment; }
+    void setAlignment(Qt::Alignment a);
+
+    int rowStretchFactor() const { return _rowstretch; }
+    void setRowStretchFactor(int f);
+    int columnStretchFactor() const { return _colstretch; }
+    void setColumnStretchFactor(int f);
+
+    int rowSpacing() const { return _rowspacing; }
+    void setRowSpacing(int s);
+    int columnSpacing() const { return _colspacing; }
+    void setColumnSpacing(int s);
+
+    int rowPreferredHeight() const { return _rowprefheight; }
+    void setRowPreferredHeight(int s) { _rowprefheight = s; }
+
+    int rowMaximumHeight() const { return _rowmaxheight; }
+    void setRowMaximumHeight(int s) { _rowmaxheight = s; }
+
+    int rowMinimumHeight() const { return _rowminheight; }
+    void setRowMinimumHeight(int s) { _rowminheight = s; }
+
+    int rowFixedHeight() const { return _rowfixheight; }
+    void setRowFixedHeight(int s) { _rowfixheight = s; }
+
+    int columnPreferredWidth() const { return _colprefwidth; }
+    void setColumnPreferredWidth(int s) { _colprefwidth = s; }
+
+    int columnMaximumWidth() const { return _colmaxwidth; }
+    void setColumnMaximumWidth(int s) { _colmaxwidth = s; }
+
+    int columnMinimumWidth() const { return _colminwidth; }
+    void setColumnMinimumWidth(int s) { _colminwidth = s; }
+
+    int columnFixedWidth() const { return _colfixwidth; }
+    void setColumnFixedWidth(int s) { _colfixwidth = s; }
+
+Q_SIGNALS:
+    void alignmentChanged(QGraphicsLayoutItem*,Qt::Alignment);
+
+private:
+    int _row;
+    int _column;
+    int _rowspan;
+    int _colspan;
+    Qt::Alignment _alignment;
+    int _rowstretch;
+    int _colstretch;
+    int _rowspacing;
+    int _colspacing;
+    int _rowprefheight;
+    int _rowmaxheight;
+    int _rowminheight;
+    int _rowfixheight;
+    int _colprefwidth;
+    int _colmaxwidth;
+    int _colminwidth;
+    int _colfixwidth;
+};
+
+QT_END_NAMESPACE
+
+QML_DECLARE_INTERFACE(QGraphicsLayoutItem)
+QML_DECLARE_INTERFACE(QGraphicsLayout)
+QML_DECLARE_TYPE(QGraphicsLinearLayoutStretchItemObject)
+QML_DECLARE_TYPE(QGraphicsLinearLayoutObject)
+QML_DECLARE_TYPEINFO(QGraphicsLinearLayoutObject, QML_HAS_ATTACHED_PROPERTIES)
+QML_DECLARE_TYPE(QGraphicsGridLayoutObject)
+QML_DECLARE_TYPEINFO(QGraphicsGridLayoutObject, QML_HAS_ATTACHED_PROPERTIES)
+
+QT_END_HEADER
+
+#endif // GRAPHICSLAYOUTS_H
diff --git a/examples/declarative/layouts/graphicsLayouts/main.cpp b/examples/declarative/layouts/graphicsLayouts/main.cpp
new file mode 100644
index 0000000..89b69bf
--- /dev/null
+++ b/examples/declarative/layouts/graphicsLayouts/main.cpp
@@ -0,0 +1,60 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the plugins of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include 
+#include 
+#include "graphicslayouts_p.h"
+#include 
+
+int main(int argc, char* argv[])
+{
+    QApplication app(argc, argv);
+    QDeclarativeView view;
+    qmlRegisterInterface("QGraphicsLayoutItem");
+    qmlRegisterInterface("QGraphicsLayout");
+    qmlRegisterType("GraphicsLayouts",4,7,"QGraphicsLinearLayoutStretchItem");
+    qmlRegisterType("GraphicsLayouts",4,7,"QGraphicsLinearLayout");
+    qmlRegisterType("GraphicsLayouts",4,7,"QGraphicsGridLayout");
+    view.setSource(QUrl(":graphicslayouts.qml"));
+    view.show();
+    return app.exec();
+};
+
diff --git a/examples/declarative/layouts/layoutItem/layoutItem.pro b/examples/declarative/layouts/layoutItem/layoutItem.pro
new file mode 100644
index 0000000..4a3fc73
--- /dev/null
+++ b/examples/declarative/layouts/layoutItem/layoutItem.pro
@@ -0,0 +1,13 @@
+######################################################################
+# Automatically generated by qmake (2.01a) Tue May 4 13:36:26 2010
+######################################################################
+
+TEMPLATE = app
+TARGET = 
+DEPENDPATH += .
+INCLUDEPATH += .
+QT += declarative
+
+# Input
+SOURCES += main.cpp
+RESOURCES += layoutItem.qrc
diff --git a/examples/declarative/layouts/layoutItem/layoutItem.qml b/examples/declarative/layouts/layoutItem/layoutItem.qml
new file mode 100644
index 0000000..9b9db22
--- /dev/null
+++ b/examples/declarative/layouts/layoutItem/layoutItem.qml
@@ -0,0 +1,16 @@
+import Qt 4.7
+import Qt.widgets 4.7
+
+LayoutItem {//Sized by the layout
+    id: resizable
+    minimumSize: "100x100"
+    maximumSize: "300x300"
+    preferredSize: "100x100"
+    Rectangle { color: "yellow"; anchors.fill: parent }
+    Rectangle { 
+        width: 100; height: 100; 
+        anchors.top: parent.top; 
+        anchors.right: parent.right;
+        color: "green"; 
+    }
+}
diff --git a/examples/declarative/layouts/layoutItem/layoutItem.qrc b/examples/declarative/layouts/layoutItem/layoutItem.qrc
new file mode 100644
index 0000000..deb0fba
--- /dev/null
+++ b/examples/declarative/layouts/layoutItem/layoutItem.qrc
@@ -0,0 +1,5 @@
+
+
+    layoutItem.qml
+
+
diff --git a/examples/declarative/layouts/layoutItem/main.cpp b/examples/declarative/layouts/layoutItem/main.cpp
new file mode 100644
index 0000000..a104251
--- /dev/null
+++ b/examples/declarative/layouts/layoutItem/main.cpp
@@ -0,0 +1,73 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+/* This example demonstrates using a LayoutItem to let QML snippets integrate
+   nicely with existing QGraphicsView applications designed with GraphicsLayouts
+*/
+int main(int argc, char* argv[])
+{
+    QApplication app(argc, argv);
+    //Set up a graphics scene with a QGraphicsWidget and Layout
+    QGraphicsView view;
+    QGraphicsScene scene;
+    QGraphicsWidget *widget = new QGraphicsWidget();
+    QGraphicsLinearLayout *layout = new QGraphicsLinearLayout();
+    widget->setLayout(layout);
+    scene.addItem(widget);
+    view.setScene(&scene);
+    //Add the QML snippet into the layout
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl(":layoutItem.qml"));
+    QGraphicsLayoutItem* obj = qobject_cast(c.create());
+    layout->addItem(obj);
+
+    widget->setGeometry(QRectF(0,0, 400,400));
+    view.show();
+    return app.exec();
+}
diff --git a/examples/declarative/layouts/layouts.qml b/examples/declarative/layouts/layouts.qml
deleted file mode 100644
index 391eab7..0000000
--- a/examples/declarative/layouts/layouts.qml
+++ /dev/null
@@ -1,29 +0,0 @@
-import Qt 4.7
-import Qt.widgets 4.7
-
-Item {
-    id: resizable
-
-    width: 400
-    height: 400
-
-    QGraphicsWidget {
-        size.width: parent.width
-        size.height: parent.height
-
-        layout: QGraphicsLinearLayout {
-            LayoutItem {
-                minimumSize: "100x100"
-                maximumSize: "300x300"
-                preferredSize: "100x100"
-                Rectangle { color: "yellow"; anchors.fill: parent }
-            }
-            LayoutItem {
-                minimumSize: "100x100"
-                maximumSize: "400x400"
-                preferredSize: "200x200"
-                Rectangle { color: "green"; anchors.fill: parent }
-            }
-        }
-    }
-}
diff --git a/examples/declarative/layouts/layouts.qmlproject b/examples/declarative/layouts/layouts.qmlproject
deleted file mode 100644
index d4909f8..0000000
--- a/examples/declarative/layouts/layouts.qmlproject
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/layouts/positioners.qml b/examples/declarative/layouts/positioners.qml
deleted file mode 100644
index 3703b59..0000000
--- a/examples/declarative/layouts/positioners.qml
+++ /dev/null
@@ -1,213 +0,0 @@
-import Qt 4.7
-
-Rectangle {
-    id: page
-    width: 420; height: 420
-
-    Column {
-        id: layout1
-        y: 0
-        move: Transition {
-            NumberAnimation { properties: "y"; easing.type: "OutBounce" }
-        }
-        add: Transition {
-            NumberAnimation { properties: "y"; easing.type: "OutQuad" }
-        }
-
-        Rectangle { color: "red"; width: 100; height: 50; border.color: "black"; radius: 15 }
-
-        Rectangle {
-            id: blueV1
-            width: 100; height: 50
-            color: "lightsteelblue"
-            border.color: "black"
-            radius: 15 
-            Behavior on opacity { NumberAnimation {} }
-        }
-
-        Rectangle { color: "green"; width: 100; height: 50; border.color: "black"; radius: 15 }
-
-        Rectangle {
-            id: blueV2
-            width: 100; height: 50
-            color: "lightsteelblue"
-            border.color: "black"
-            radius: 15 
-            Behavior on opacity { NumberAnimation {} }
-        }
-
-        Rectangle { color: "orange"; width: 100; height: 50; border.color: "black"; radius: 15 }
-    }
-
-    Row {
-        id: layout2
-        y: 300 
-        move: Transition {
-            NumberAnimation { properties: "x"; easing.type: "OutBounce" }
-        }
-        add: Transition {
-            NumberAnimation { properties: "x"; easing.type: "OutQuad" }
-        }
-
-        Rectangle { color: "red"; width: 50; height: 100; border.color: "black"; radius: 15 }
-
-        Rectangle {
-            id: blueH1
-            width: 50; height: 100
-            color: "lightsteelblue"
-            border.color: "black"
-            radius: 15
-            Behavior on opacity { NumberAnimation {} }
-        }
-
-        Rectangle { color: "green"; width: 50; height: 100; border.color: "black"; radius: 15 }
-
-        Rectangle {
-            id: blueH2
-            width: 50; height: 100
-            color: "lightsteelblue"
-            border.color: "black"
-            radius: 15 
-            Behavior on opacity { NumberAnimation {} }
-        }
-
-        Rectangle { color: "orange"; width: 50; height: 100; border.color: "black"; radius: 15 }
-    }
-
-    Button {
-        x: 135; y: 90
-        text: "Remove"
-        icon: "del.png"
-
-        onClicked: {
-            blueH2.opacity = 0
-            blueH1.opacity = 0
-            blueV1.opacity = 0
-            blueV2.opacity = 0
-            blueG1.opacity = 0
-            blueG2.opacity = 0
-            blueG3.opacity = 0
-            blueF1.opacity = 0
-            blueF2.opacity = 0
-            blueF3.opacity = 0
-        }
-    }
-
-    Button {
-        x: 145; y: 140
-        text: "Add"
-        icon: "add.png"
-
-        onClicked: {
-            blueH2.opacity = 1
-            blueH1.opacity = 1
-            blueV1.opacity = 1
-            blueV2.opacity = 1
-            blueG1.opacity = 1
-            blueG2.opacity = 1
-            blueG3.opacity = 1
-            blueF1.opacity = 1
-            blueF2.opacity = 1
-            blueF3.opacity = 1
-        }
-    }
-
-    Grid {
-        x: 260; y: 0
-        columns: 3
-
-        move: Transition {
-            NumberAnimation { properties: "x,y"; easing.type: "OutBounce" }
-        }
-
-        add: Transition {
-            NumberAnimation { properties: "x,y"; easing.type: "OutBounce" }
-        }
-
-        Rectangle { color: "red"; width: 50; height: 50; border.color: "black"; radius: 15 }
-
-        Rectangle {
-            id: blueG1
-            width: 50; height: 50
-            color: "lightsteelblue"
-            border.color: "black"
-            radius: 15 
-            Behavior on opacity { NumberAnimation {} }
-        }
-
-        Rectangle { color: "green"; width: 50; height: 50; border.color: "black"; radius: 15 }
-
-        Rectangle {
-            id: blueG2
-            width: 50; height: 50
-            color: "lightsteelblue"
-            border.color: "black"
-            radius: 15 
-            Behavior on opacity { NumberAnimation {} }
-        }
-
-        Rectangle { color: "orange"; width: 50; height: 50; border.color: "black"; radius: 15 }
-
-        Rectangle {
-            id: blueG3
-            width: 50; height: 50
-            color: "lightsteelblue"
-            border.color: "black"
-            radius: 15 
-            Behavior on opacity { NumberAnimation {} }
-        }
-
-        Rectangle { color: "red"; width: 50; height: 50; border.color: "black"; radius: 15 }
-        Rectangle { color: "green"; width: 50; height: 50; border.color: "black"; radius: 15 }
-        Rectangle { color: "orange"; width: 50; height: 50; border.color: "black"; radius: 15 }
-    }
-
-    Flow {
-        id: layout4
-        x: 260; y: 250; width: 150
-
-        move: Transition {
-            NumberAnimation { properties: "x,y"; easing.type: "OutBounce" }
-        }
-
-        add: Transition {
-            NumberAnimation { properties: "x,y"; easing.type: "OutBounce" }
-        }
-
-        Rectangle { color: "red"; width: 50; height: 50; border.color: "black"; radius: 15 }
-
-        Rectangle {
-            id: blueF1
-            width: 60; height: 50
-            color: "lightsteelblue"
-            border.color: "black"
-            radius: 15 
-            Behavior on opacity { NumberAnimation {} }
-        }
-
-        Rectangle { color: "green"; width: 30; height: 50; border.color: "black"; radius: 15 }
-
-        Rectangle {
-            id: blueF2
-            width: 60; height: 50
-            color: "lightsteelblue"
-            border.color: "black"
-            radius: 15 
-            Behavior on opacity { NumberAnimation {} }
-        }
-
-        Rectangle { color: "orange"; width: 50; height: 50; border.color: "black"; radius: 15 }
-
-        Rectangle { 
-            id: blueF3
-            width: 40; height: 50
-            color: "lightsteelblue"
-            border.color: "black"
-            radius: 15 
-            Behavior on opacity { NumberAnimation {} }
-        }
-
-        Rectangle { color: "red"; width: 80; height: 50; border.color: "black"; radius: 15 }
-    }
-
-}
diff --git a/examples/declarative/layouts/positioners/Button.qml b/examples/declarative/layouts/positioners/Button.qml
new file mode 100644
index 0000000..0f08893
--- /dev/null
+++ b/examples/declarative/layouts/positioners/Button.qml
@@ -0,0 +1,22 @@
+import Qt 4.7
+
+Rectangle { border.color: "black"; color: "steelblue"; radius: 5; width: pix.width + textelement.width + 13; height: pix.height + 10; id: page
+    property string text
+    property string icon
+    signal clicked
+
+    Image { id: pix; x: 5; y:5; source: parent.icon}
+    Text { id: textelement; text: page.text; color: "white"; x:pix.width+pix.x+3; anchors.verticalCenter: pix.verticalCenter;}
+    MouseArea{ id:mr; anchors.fill: parent; onClicked: {parent.focus = true; page.clicked()}}
+
+    states:
+        State{ name:"pressed"; when:mr.pressed
+            PropertyChanges {target:textelement; x: 5}
+            PropertyChanges {target:pix; x:textelement.x+textelement.width + 3}
+        }
+
+    transitions:
+        Transition{
+            NumberAnimation { properties:"x,left"; easing.type:"InOutQuad"; duration:200 }
+        }
+}
diff --git a/examples/declarative/layouts/positioners/add.png b/examples/declarative/layouts/positioners/add.png
new file mode 100644
index 0000000..f29d84b
Binary files /dev/null and b/examples/declarative/layouts/positioners/add.png differ
diff --git a/examples/declarative/layouts/positioners/del.png b/examples/declarative/layouts/positioners/del.png
new file mode 100644
index 0000000..1d753a3
Binary files /dev/null and b/examples/declarative/layouts/positioners/del.png differ
diff --git a/examples/declarative/layouts/positioners/positioners.qml b/examples/declarative/layouts/positioners/positioners.qml
new file mode 100644
index 0000000..3703b59
--- /dev/null
+++ b/examples/declarative/layouts/positioners/positioners.qml
@@ -0,0 +1,213 @@
+import Qt 4.7
+
+Rectangle {
+    id: page
+    width: 420; height: 420
+
+    Column {
+        id: layout1
+        y: 0
+        move: Transition {
+            NumberAnimation { properties: "y"; easing.type: "OutBounce" }
+        }
+        add: Transition {
+            NumberAnimation { properties: "y"; easing.type: "OutQuad" }
+        }
+
+        Rectangle { color: "red"; width: 100; height: 50; border.color: "black"; radius: 15 }
+
+        Rectangle {
+            id: blueV1
+            width: 100; height: 50
+            color: "lightsteelblue"
+            border.color: "black"
+            radius: 15 
+            Behavior on opacity { NumberAnimation {} }
+        }
+
+        Rectangle { color: "green"; width: 100; height: 50; border.color: "black"; radius: 15 }
+
+        Rectangle {
+            id: blueV2
+            width: 100; height: 50
+            color: "lightsteelblue"
+            border.color: "black"
+            radius: 15 
+            Behavior on opacity { NumberAnimation {} }
+        }
+
+        Rectangle { color: "orange"; width: 100; height: 50; border.color: "black"; radius: 15 }
+    }
+
+    Row {
+        id: layout2
+        y: 300 
+        move: Transition {
+            NumberAnimation { properties: "x"; easing.type: "OutBounce" }
+        }
+        add: Transition {
+            NumberAnimation { properties: "x"; easing.type: "OutQuad" }
+        }
+
+        Rectangle { color: "red"; width: 50; height: 100; border.color: "black"; radius: 15 }
+
+        Rectangle {
+            id: blueH1
+            width: 50; height: 100
+            color: "lightsteelblue"
+            border.color: "black"
+            radius: 15
+            Behavior on opacity { NumberAnimation {} }
+        }
+
+        Rectangle { color: "green"; width: 50; height: 100; border.color: "black"; radius: 15 }
+
+        Rectangle {
+            id: blueH2
+            width: 50; height: 100
+            color: "lightsteelblue"
+            border.color: "black"
+            radius: 15 
+            Behavior on opacity { NumberAnimation {} }
+        }
+
+        Rectangle { color: "orange"; width: 50; height: 100; border.color: "black"; radius: 15 }
+    }
+
+    Button {
+        x: 135; y: 90
+        text: "Remove"
+        icon: "del.png"
+
+        onClicked: {
+            blueH2.opacity = 0
+            blueH1.opacity = 0
+            blueV1.opacity = 0
+            blueV2.opacity = 0
+            blueG1.opacity = 0
+            blueG2.opacity = 0
+            blueG3.opacity = 0
+            blueF1.opacity = 0
+            blueF2.opacity = 0
+            blueF3.opacity = 0
+        }
+    }
+
+    Button {
+        x: 145; y: 140
+        text: "Add"
+        icon: "add.png"
+
+        onClicked: {
+            blueH2.opacity = 1
+            blueH1.opacity = 1
+            blueV1.opacity = 1
+            blueV2.opacity = 1
+            blueG1.opacity = 1
+            blueG2.opacity = 1
+            blueG3.opacity = 1
+            blueF1.opacity = 1
+            blueF2.opacity = 1
+            blueF3.opacity = 1
+        }
+    }
+
+    Grid {
+        x: 260; y: 0
+        columns: 3
+
+        move: Transition {
+            NumberAnimation { properties: "x,y"; easing.type: "OutBounce" }
+        }
+
+        add: Transition {
+            NumberAnimation { properties: "x,y"; easing.type: "OutBounce" }
+        }
+
+        Rectangle { color: "red"; width: 50; height: 50; border.color: "black"; radius: 15 }
+
+        Rectangle {
+            id: blueG1
+            width: 50; height: 50
+            color: "lightsteelblue"
+            border.color: "black"
+            radius: 15 
+            Behavior on opacity { NumberAnimation {} }
+        }
+
+        Rectangle { color: "green"; width: 50; height: 50; border.color: "black"; radius: 15 }
+
+        Rectangle {
+            id: blueG2
+            width: 50; height: 50
+            color: "lightsteelblue"
+            border.color: "black"
+            radius: 15 
+            Behavior on opacity { NumberAnimation {} }
+        }
+
+        Rectangle { color: "orange"; width: 50; height: 50; border.color: "black"; radius: 15 }
+
+        Rectangle {
+            id: blueG3
+            width: 50; height: 50
+            color: "lightsteelblue"
+            border.color: "black"
+            radius: 15 
+            Behavior on opacity { NumberAnimation {} }
+        }
+
+        Rectangle { color: "red"; width: 50; height: 50; border.color: "black"; radius: 15 }
+        Rectangle { color: "green"; width: 50; height: 50; border.color: "black"; radius: 15 }
+        Rectangle { color: "orange"; width: 50; height: 50; border.color: "black"; radius: 15 }
+    }
+
+    Flow {
+        id: layout4
+        x: 260; y: 250; width: 150
+
+        move: Transition {
+            NumberAnimation { properties: "x,y"; easing.type: "OutBounce" }
+        }
+
+        add: Transition {
+            NumberAnimation { properties: "x,y"; easing.type: "OutBounce" }
+        }
+
+        Rectangle { color: "red"; width: 50; height: 50; border.color: "black"; radius: 15 }
+
+        Rectangle {
+            id: blueF1
+            width: 60; height: 50
+            color: "lightsteelblue"
+            border.color: "black"
+            radius: 15 
+            Behavior on opacity { NumberAnimation {} }
+        }
+
+        Rectangle { color: "green"; width: 30; height: 50; border.color: "black"; radius: 15 }
+
+        Rectangle {
+            id: blueF2
+            width: 60; height: 50
+            color: "lightsteelblue"
+            border.color: "black"
+            radius: 15 
+            Behavior on opacity { NumberAnimation {} }
+        }
+
+        Rectangle { color: "orange"; width: 50; height: 50; border.color: "black"; radius: 15 }
+
+        Rectangle { 
+            id: blueF3
+            width: 40; height: 50
+            color: "lightsteelblue"
+            border.color: "black"
+            radius: 15 
+            Behavior on opacity { NumberAnimation {} }
+        }
+
+        Rectangle { color: "red"; width: 80; height: 50; border.color: "black"; radius: 15 }
+    }
+
+}
diff --git a/examples/declarative/layouts/positioners/positioners.qmlproject b/examples/declarative/layouts/positioners/positioners.qmlproject
new file mode 100644
index 0000000..e526217
--- /dev/null
+++ b/examples/declarative/layouts/positioners/positioners.qmlproject
@@ -0,0 +1,18 @@
+/* File generated by QtCreator */
+
+import QmlProject 1.0
+
+Project {
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+    JavaScriptFiles {
+        directory: "."
+    }
+    ImageFiles {
+        directory: "."
+    }
+    /* List of plugin directories passed to QML runtime */
+    // importPaths: [ " ../exampleplugin " ]
+}
diff --git a/examples/declarative/layouts/positioners/positioners.qmlproject.user b/examples/declarative/layouts/positioners/positioners.qmlproject.user
new file mode 100644
index 0000000..593479d
--- /dev/null
+++ b/examples/declarative/layouts/positioners/positioners.qmlproject.user
@@ -0,0 +1,41 @@
+
+
+ 
+  ProjectExplorer.Project.ActiveTarget
+  0
+ 
+ 
+  ProjectExplorer.Project.EditorSettings
+  
+   UTF-8
+  
+ 
+ 
+  ProjectExplorer.Project.Target.0
+  
+   QML Runtime
+   QmlProjectManager.QmlTarget
+   -1
+   0
+   0
+   
+    QML Runtime
+    QmlProjectManager.QmlRunConfiguration
+    127.0.0.1
+    3768
+    positioners.qml
+    
+    
+   
+   1
+  
+ 
+ 
+  ProjectExplorer.Project.TargetCount
+  1
+ 
+ 
+  ProjectExplorer.Project.Updater.FileVersion
+  4
+ 
+
diff --git a/src/imports/imports.pro b/src/imports/imports.pro
index ecde0cc..1754908 100644
--- a/src/imports/imports.pro
+++ b/src/imports/imports.pro
@@ -1,6 +1,6 @@
 TEMPLATE = subdirs
 
-SUBDIRS += widgets particles
+SUBDIRS += particles
 
 contains(QT_CONFIG, webkit): SUBDIRS += webkit
 contains(QT_CONFIG, mediaservices): SUBDIRS += multimedia
diff --git a/src/imports/widgets/graphicslayouts.cpp b/src/imports/widgets/graphicslayouts.cpp
deleted file mode 100644
index 25cf994..0000000
--- a/src/imports/widgets/graphicslayouts.cpp
+++ /dev/null
@@ -1,366 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "graphicslayouts_p.h"
-
-#include 
-#include 
-
-QT_BEGIN_NAMESPACE
-
-LinearLayoutAttached::LinearLayoutAttached(QObject *parent)
-: QObject(parent), _stretch(1), _alignment(Qt::AlignCenter), _spacing(0)
-{
-}
-
-void LinearLayoutAttached::setStretchFactor(int f)
-{
-    if (_stretch == f)
-        return;
-
-    _stretch = f;
-    emit stretchChanged(reinterpret_cast(parent()), _stretch);
-}
-
-void LinearLayoutAttached::setSpacing(int s)
-{
-    if (_spacing == s)
-        return;
-
-    _spacing = s;
-    emit spacingChanged(reinterpret_cast(parent()), _spacing);
-}
-
-void LinearLayoutAttached::setAlignment(Qt::Alignment a)
-{
-    if (_alignment == a)
-        return;
-
-    _alignment = a;
-    emit alignmentChanged(reinterpret_cast(parent()), _alignment);
-}
-
-QGraphicsLinearLayoutStretchItemObject::QGraphicsLinearLayoutStretchItemObject(QObject *parent)
-    : QObject(parent)
-{
-}
-
-QSizeF QGraphicsLinearLayoutStretchItemObject::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
-{
-Q_UNUSED(which);
-Q_UNUSED(constraint);
-return QSizeF();
-}
-
-
-QGraphicsLinearLayoutObject::QGraphicsLinearLayoutObject(QObject *parent)
-: QObject(parent)
-{
-}
-
-QGraphicsLinearLayoutObject::~QGraphicsLinearLayoutObject()
-{
-}
-
-void QGraphicsLinearLayoutObject::insertLayoutItem(int index, QGraphicsLayoutItem *item)
-{
-insertItem(index, item);
-
-//connect attached properties
-if (LinearLayoutAttached *obj = attachedProperties.value(item)) {
-    setStretchFactor(item, obj->stretchFactor());
-    setAlignment(item, obj->alignment());
-    updateSpacing(item, obj->spacing());
-    QObject::connect(obj, SIGNAL(stretchChanged(QGraphicsLayoutItem*,int)),
-                     this, SLOT(updateStretch(QGraphicsLayoutItem*,int)));
-    QObject::connect(obj, SIGNAL(alignmentChanged(QGraphicsLayoutItem*,Qt::Alignment)),
-                     this, SLOT(updateAlignment(QGraphicsLayoutItem*,Qt::Alignment)));
-    QObject::connect(obj, SIGNAL(spacingChanged(QGraphicsLayoutItem*,int)),
-                     this, SLOT(updateSpacing(QGraphicsLayoutItem*,int)));
-    //### need to disconnect when widget is removed?
-}
-}
-
-//### is there a better way to do this?
-void QGraphicsLinearLayoutObject::clearChildren()
-{
-for (int i = 0; i < count(); ++i)
-    removeAt(i);
-}
-
-qreal QGraphicsLinearLayoutObject::contentsMargin() const
-{
-    qreal a,b,c,d;
-    getContentsMargins(&a, &b, &c, &d);
-    if(a==b && a==c && a==d)
-        return a;
-    return -1;
-}
-
-void QGraphicsLinearLayoutObject::setContentsMargin(qreal m)
-{
-    setContentsMargins(m,m,m,m);
-}
-
-void QGraphicsLinearLayoutObject::updateStretch(QGraphicsLayoutItem *item, int stretch)
-{
-QGraphicsLinearLayout::setStretchFactor(item, stretch);
-}
-
-void QGraphicsLinearLayoutObject::updateSpacing(QGraphicsLayoutItem* item, int spacing)
-{
-    for(int i=0; i < count(); i++){
-        if(itemAt(i) == item){ //I do not see the reverse function, which is why we must loop over all items
-            QGraphicsLinearLayout::setItemSpacing(i, spacing);
-            return;
-        }
-    }
-}
-
-void QGraphicsLinearLayoutObject::updateAlignment(QGraphicsLayoutItem *item, Qt::Alignment alignment)
-{
-QGraphicsLinearLayout::setAlignment(item, alignment);
-}
-
-QHash QGraphicsLinearLayoutObject::attachedProperties;
-LinearLayoutAttached *QGraphicsLinearLayoutObject::qmlAttachedProperties(QObject *obj)
-{
-// ### This is not allowed - you must attach to any object
-if (!qobject_cast(obj))
-    return 0;
-LinearLayoutAttached *rv = new LinearLayoutAttached(obj);
-attachedProperties.insert(qobject_cast(obj), rv);
-return rv;
-}
-
-//////////////////////////////////////////////////////////////////////////////////////////////////////
-// QGraphicsGridLayout-related classes
-//////////////////////////////////////////////////////////////////////////////////////////////////////
-GridLayoutAttached::GridLayoutAttached(QObject *parent)
-: QObject(parent), _row(-1), _column(-1), _rowspan(1), _colspan(1), _alignment(-1), _rowstretch(-1),
-    _colstretch(-1), _rowspacing(-1), _colspacing(-1), _rowprefheight(-1), _rowmaxheight(-1), _rowminheight(-1),
-    _rowfixheight(-1), _colprefwidth(-1), _colmaxwidth(-1), _colminwidth(-1), _colfixwidth(-1)
-{
-}
-
-void GridLayoutAttached::setRow(int r)
-{
-    if (_row == r)
-        return;
-
-    _row = r;
-    //emit rowChanged(reinterpret_cast(parent()), _row);
-}
-
-void GridLayoutAttached::setColumn(int c)
-{
-    if (_column == c)
-        return;
-
-    _column = c;
-    //emit columnChanged(reinterpret_cast(parent()), _column);
-}
-
-void GridLayoutAttached::setRowSpan(int rs)
-{
-    if (_rowspan == rs)
-        return;
-
-    _rowspan = rs;
-    //emit rowSpanChanged(reinterpret_cast(parent()), _rowSpan);
-}
-
-void GridLayoutAttached::setColumnSpan(int cs)
-{
-    if (_colspan == cs)
-        return;
-
-    _colspan = cs;
-    //emit columnSpanChanged(reinterpret_cast(parent()), _columnSpan);
-}
-
-void GridLayoutAttached::setAlignment(Qt::Alignment a)
-{
-    if (_alignment == a)
-        return;
-
-    _alignment = a;
-    emit alignmentChanged(reinterpret_cast(parent()), _alignment);
-}
-
-void GridLayoutAttached::setRowStretchFactor(int f)
-{
-    _rowstretch = f;
-}
-
-void GridLayoutAttached::setColumnStretchFactor(int f)
-{
-    _colstretch = f;
-}
-
-void GridLayoutAttached::setRowSpacing(int s)
-{
-    _rowspacing = s;
-}
-
-void GridLayoutAttached::setColumnSpacing(int s)
-{
-    _colspacing = s;
-}
-
-
-QGraphicsGridLayoutObject::QGraphicsGridLayoutObject(QObject *parent)
-: QObject(parent)
-{
-}
-
-QGraphicsGridLayoutObject::~QGraphicsGridLayoutObject()
-{
-}
-
-void QGraphicsGridLayoutObject::addWidget(QGraphicsWidget *wid)
-{
-//use attached properties
-if (QObject *obj = attachedProperties.value(qobject_cast(wid))) {
-    int row = static_cast(obj)->row();
-    int column = static_cast(obj)->column();
-    int rowSpan = static_cast(obj)->rowSpan();
-    int columnSpan = static_cast(obj)->columnSpan();
-    if (row == -1 || column == -1) {
-        qWarning() << "Must set row and column for an item in a grid layout";
-        return;
-    }
-    addItem(wid, row, column, rowSpan, columnSpan);
-}
-}
-
-void QGraphicsGridLayoutObject::addLayoutItem(QGraphicsLayoutItem *item)
-{
-//use attached properties
-if (GridLayoutAttached *obj = attachedProperties.value(item)) {
-    int row = obj->row();
-    int column = obj->column();
-    int rowSpan = obj->rowSpan();
-    int columnSpan = obj->columnSpan();
-    Qt::Alignment alignment = obj->alignment();
-    if (row == -1 || column == -1) {
-        qWarning() << "Must set row and column for an item in a grid layout";
-        return;
-    }
-    if(obj->rowSpacing() != -1)
-        setRowSpacing(row, obj->rowSpacing());
-    if(obj->columnSpacing() != -1)
-        setColumnSpacing(column, obj->columnSpacing());
-    if(obj->rowStretchFactor() != -1)
-        setRowStretchFactor(row, obj->rowStretchFactor());
-    if(obj->columnStretchFactor() != -1)
-        setColumnStretchFactor(column, obj->columnStretchFactor());
-    if(obj->rowPreferredHeight() != -1)
-        setRowPreferredHeight(row, obj->rowPreferredHeight());
-    if(obj->rowMaximumHeight() != -1)
-        setRowMaximumHeight(row, obj->rowMaximumHeight());
-    if(obj->rowMinimumHeight() != -1)
-        setRowMinimumHeight(row, obj->rowMinimumHeight());
-    if(obj->rowFixedHeight() != -1)
-        setRowFixedHeight(row, obj->rowFixedHeight());
-    if(obj->columnPreferredWidth() != -1)
-        setColumnPreferredWidth(row, obj->columnPreferredWidth());
-    if(obj->columnMaximumWidth() != -1)
-        setColumnMaximumWidth(row, obj->columnMaximumWidth());
-    if(obj->columnMinimumWidth() != -1)
-        setColumnMinimumWidth(row, obj->columnMinimumWidth());
-    if(obj->columnFixedWidth() != -1)
-        setColumnFixedWidth(row, obj->columnFixedWidth());
-    addItem(item, row, column, rowSpan, columnSpan);
-    if (alignment != -1)
-        setAlignment(item,alignment);
-    QObject::connect(obj, SIGNAL(alignmentChanged(QGraphicsLayoutItem*,Qt::Alignment)),
-                     this, SLOT(updateAlignment(QGraphicsLayoutItem*,Qt::Alignment)));
-    //### need to disconnect when widget is removed?
-}
-}
-
-//### is there a better way to do this?
-void QGraphicsGridLayoutObject::clearChildren()
-{
-for (int i = 0; i < count(); ++i)
-    removeAt(i);
-}
-
-qreal QGraphicsGridLayoutObject::spacing() const
-{
-if (verticalSpacing() == horizontalSpacing())
-    return verticalSpacing();
-return -1;  //###
-}
-
-qreal QGraphicsGridLayoutObject::contentsMargin() const
-{
-    qreal a,b,c,d;
-    getContentsMargins(&a, &b, &c, &d);
-    if(a==b && a==c && a==d)
-        return a;
-    return -1;
-}
-
-void QGraphicsGridLayoutObject::setContentsMargin(qreal m)
-{
-    setContentsMargins(m,m,m,m);
-}
-
-
-void QGraphicsGridLayoutObject::updateAlignment(QGraphicsLayoutItem *item, Qt::Alignment alignment)
-{
-QGraphicsGridLayout::setAlignment(item, alignment);
-}
-
-QHash QGraphicsGridLayoutObject::attachedProperties;
-GridLayoutAttached *QGraphicsGridLayoutObject::qmlAttachedProperties(QObject *obj)
-{
-// ### This is not allowed - you must attach to any object
-if (!qobject_cast(obj))
-    return 0;
-GridLayoutAttached *rv = new GridLayoutAttached(obj);
-attachedProperties.insert(qobject_cast(obj), rv);
-return rv;
-}
-
-QT_END_NAMESPACE
diff --git a/src/imports/widgets/graphicslayouts_p.h b/src/imports/widgets/graphicslayouts_p.h
deleted file mode 100644
index ea9c614..0000000
--- a/src/imports/widgets/graphicslayouts_p.h
+++ /dev/null
@@ -1,303 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef GRAPHICSLAYOUTS_H
-#define GRAPHICSLAYOUTS_H
-
-#include 
-#include 
-#include 
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class QGraphicsLinearLayoutStretchItemObject : public QObject, public QGraphicsLayoutItem
-{
-    Q_OBJECT
-    Q_INTERFACES(QGraphicsLayoutItem)
-public:
-    QGraphicsLinearLayoutStretchItemObject(QObject *parent = 0);
-
-    virtual QSizeF sizeHint(Qt::SizeHint, const QSizeF &) const;
-};
-
-class LinearLayoutAttached;
-class QGraphicsLinearLayoutObject : public QObject, public QGraphicsLinearLayout
-{
-    Q_OBJECT
-    Q_INTERFACES(QGraphicsLayout QGraphicsLayoutItem)
-
-    Q_PROPERTY(QDeclarativeListProperty children READ children)
-    Q_PROPERTY(Qt::Orientation orientation READ orientation WRITE setOrientation)
-    Q_PROPERTY(qreal spacing READ spacing WRITE setSpacing)
-    Q_PROPERTY(qreal contentsMargin READ contentsMargin WRITE setContentsMargin)
-    Q_CLASSINFO("DefaultProperty", "children")
-public:
-    QGraphicsLinearLayoutObject(QObject * = 0);
-    ~QGraphicsLinearLayoutObject();
-
-    QDeclarativeListProperty children() { return QDeclarativeListProperty(this, 0, children_append, children_count, children_at, children_clear); }
-
-    static LinearLayoutAttached *qmlAttachedProperties(QObject *);
-
-    qreal contentsMargin() const;
-    void setContentsMargin(qreal);
-
-private Q_SLOTS:
-    void updateStretch(QGraphicsLayoutItem*,int);
-    void updateSpacing(QGraphicsLayoutItem*,int);
-    void updateAlignment(QGraphicsLayoutItem*,Qt::Alignment);
-
-private:
-    friend class LinearLayoutAttached;
-    void clearChildren();
-    void insertLayoutItem(int, QGraphicsLayoutItem *);
-    static QHash attachedProperties;
-
-    static void children_append(QDeclarativeListProperty *prop, QGraphicsLayoutItem *item) {
-        static_cast(prop->object)->insertLayoutItem(-1, item);
-    }
-
-    static void children_clear(QDeclarativeListProperty *prop) {
-        static_cast(prop->object)->clearChildren();
-    }
-
-    static int children_count(QDeclarativeListProperty *prop) {
-        return static_cast(prop->object)->count();
-    }
-
-    static QGraphicsLayoutItem *children_at(QDeclarativeListProperty *prop, int index) {
-        return static_cast(prop->object)->itemAt(index);
-    }
-};
-
-class GridLayoutAttached;
-class QGraphicsGridLayoutObject : public QObject, public QGraphicsGridLayout
-{
-    Q_OBJECT
-    Q_INTERFACES(QGraphicsLayout QGraphicsLayoutItem)
-
-    Q_PROPERTY(QDeclarativeListProperty children READ children)
-    Q_PROPERTY(qreal spacing READ spacing WRITE setSpacing)
-    Q_PROPERTY(qreal contentsMargin READ contentsMargin WRITE setContentsMargin)
-    Q_PROPERTY(qreal verticalSpacing READ verticalSpacing WRITE setVerticalSpacing)
-    Q_PROPERTY(qreal horizontalSpacing READ horizontalSpacing WRITE setHorizontalSpacing)
-    Q_CLASSINFO("DefaultProperty", "children")
-public:
-    QGraphicsGridLayoutObject(QObject * = 0);
-    ~QGraphicsGridLayoutObject();
-
-    QDeclarativeListProperty children() { return QDeclarativeListProperty(this, 0, children_append, children_count, children_at, children_clear); }
-
-    qreal spacing() const;
-    qreal contentsMargin() const;
-    void setContentsMargin(qreal);
-
-    static GridLayoutAttached *qmlAttachedProperties(QObject *);
-
-private Q_SLOTS:
-    void updateAlignment(QGraphicsLayoutItem*,Qt::Alignment);
-
-private:
-    friend class GraphicsLayoutAttached;
-    void addWidget(QGraphicsWidget *);
-    void clearChildren();
-    void addLayoutItem(QGraphicsLayoutItem *);
-    static QHash attachedProperties;
-
-    static void children_append(QDeclarativeListProperty *prop, QGraphicsLayoutItem *item) {
-        static_cast(prop->object)->addLayoutItem(item);
-    }
-
-    static void children_clear(QDeclarativeListProperty *prop) {
-        static_cast(prop->object)->clearChildren();
-    }
-
-    static int children_count(QDeclarativeListProperty *prop) {
-        return static_cast(prop->object)->count();
-    }
-
-    static QGraphicsLayoutItem *children_at(QDeclarativeListProperty *prop, int index) {
-        return static_cast(prop->object)->itemAt(index);
-    }
-};
-
-class LinearLayoutAttached : public QObject
-{
-    Q_OBJECT
-
-    Q_PROPERTY(int stretchFactor READ stretchFactor WRITE setStretchFactor NOTIFY stretchChanged)
-    Q_PROPERTY(Qt::Alignment alignment READ alignment WRITE setAlignment NOTIFY alignmentChanged)
-    Q_PROPERTY(int spacing READ spacing WRITE setSpacing NOTIFY spacingChanged)
-public:
-    LinearLayoutAttached(QObject *parent);
-
-    int stretchFactor() const { return _stretch; }
-    void setStretchFactor(int f);
-    Qt::Alignment alignment() const { return _alignment; }
-    void setAlignment(Qt::Alignment a);
-    int spacing() const { return _spacing; }
-    void setSpacing(int s);
-
-Q_SIGNALS:
-    void stretchChanged(QGraphicsLayoutItem*,int);
-    void alignmentChanged(QGraphicsLayoutItem*,Qt::Alignment);
-    void spacingChanged(QGraphicsLayoutItem*,int);
-
-private:
-    int _stretch;
-    Qt::Alignment _alignment;
-    int _spacing;
-};
-
-class GridLayoutAttached : public QObject
-{
-    Q_OBJECT
-
-    Q_PROPERTY(int row READ row WRITE setRow)
-    Q_PROPERTY(int column READ column WRITE setColumn)
-    Q_PROPERTY(int rowSpan READ rowSpan WRITE setRowSpan)
-    Q_PROPERTY(int columnSpan READ columnSpan WRITE setColumnSpan)
-    Q_PROPERTY(Qt::Alignment alignment READ alignment WRITE setAlignment)
-    Q_PROPERTY(int rowStretchFactor READ rowStretchFactor WRITE setRowStretchFactor)
-    Q_PROPERTY(int columnStretchFactor READ columnStretchFactor WRITE setColumnStretchFactor)
-    Q_PROPERTY(int rowSpacing READ rowSpacing WRITE setRowSpacing)
-    Q_PROPERTY(int columnSpacing READ columnSpacing WRITE setColumnSpacing)
-    Q_PROPERTY(int rowPreferredHeight READ rowPreferredHeight WRITE setRowPreferredHeight)
-    Q_PROPERTY(int rowMinimumHeight READ rowMinimumHeight WRITE setRowMinimumHeight)
-    Q_PROPERTY(int rowMaximumHeight READ rowMaximumHeight WRITE setRowMaximumHeight)
-    Q_PROPERTY(int rowFixedHeight READ rowFixedHeight WRITE setRowFixedHeight)
-    Q_PROPERTY(int columnPreferredWidth READ columnPreferredWidth WRITE setColumnPreferredWidth)
-    Q_PROPERTY(int columnMaximumWidth READ columnMaximumWidth WRITE setColumnMaximumWidth)
-    Q_PROPERTY(int columnMinimumWidth READ columnMinimumWidth WRITE setColumnMinimumWidth)
-    Q_PROPERTY(int columnFixedWidth READ columnFixedWidth WRITE setColumnFixedWidth)
-
-public:
-    GridLayoutAttached(QObject *parent);
-
-    int row() const { return _row; }
-    void setRow(int r);
-
-    int column() const { return _column; }
-    void setColumn(int c);
-
-    int rowSpan() const { return _rowspan; }
-    void setRowSpan(int rs);
-
-    int columnSpan() const { return _colspan; }
-    void setColumnSpan(int cs);
-
-    Qt::Alignment alignment() const { return _alignment; }
-    void setAlignment(Qt::Alignment a);
-
-    int rowStretchFactor() const { return _rowstretch; }
-    void setRowStretchFactor(int f);
-    int columnStretchFactor() const { return _colstretch; }
-    void setColumnStretchFactor(int f);
-
-    int rowSpacing() const { return _rowspacing; }
-    void setRowSpacing(int s);
-    int columnSpacing() const { return _colspacing; }
-    void setColumnSpacing(int s);
-
-    int rowPreferredHeight() const { return _rowprefheight; }
-    void setRowPreferredHeight(int s) { _rowprefheight = s; }
-
-    int rowMaximumHeight() const { return _rowmaxheight; }
-    void setRowMaximumHeight(int s) { _rowmaxheight = s; }
-
-    int rowMinimumHeight() const { return _rowminheight; }
-    void setRowMinimumHeight(int s) { _rowminheight = s; }
-
-    int rowFixedHeight() const { return _rowfixheight; }
-    void setRowFixedHeight(int s) { _rowfixheight = s; }
-
-    int columnPreferredWidth() const { return _colprefwidth; }
-    void setColumnPreferredWidth(int s) { _colprefwidth = s; }
-
-    int columnMaximumWidth() const { return _colmaxwidth; }
-    void setColumnMaximumWidth(int s) { _colmaxwidth = s; }
-
-    int columnMinimumWidth() const { return _colminwidth; }
-    void setColumnMinimumWidth(int s) { _colminwidth = s; }
-
-    int columnFixedWidth() const { return _colfixwidth; }
-    void setColumnFixedWidth(int s) { _colfixwidth = s; }
-
-Q_SIGNALS:
-    void alignmentChanged(QGraphicsLayoutItem*,Qt::Alignment);
-
-private:
-    int _row;
-    int _column;
-    int _rowspan;
-    int _colspan;
-    Qt::Alignment _alignment;
-    int _rowstretch;
-    int _colstretch;
-    int _rowspacing;
-    int _colspacing;
-    int _rowprefheight;
-    int _rowmaxheight;
-    int _rowminheight;
-    int _rowfixheight;
-    int _colprefwidth;
-    int _colmaxwidth;
-    int _colminwidth;
-    int _colfixwidth;
-};
-
-QT_END_NAMESPACE
-
-QML_DECLARE_INTERFACE(QGraphicsLayoutItem)
-QML_DECLARE_INTERFACE(QGraphicsLayout)
-QML_DECLARE_TYPE(QGraphicsLinearLayoutStretchItemObject)
-QML_DECLARE_TYPE(QGraphicsLinearLayoutObject)
-QML_DECLARE_TYPEINFO(QGraphicsLinearLayoutObject, QML_HAS_ATTACHED_PROPERTIES)
-QML_DECLARE_TYPE(QGraphicsGridLayoutObject)
-QML_DECLARE_TYPEINFO(QGraphicsGridLayoutObject, QML_HAS_ATTACHED_PROPERTIES)
-
-QT_END_HEADER
-
-#endif // GRAPHICSLAYOUTS_H
diff --git a/src/imports/widgets/qmldir b/src/imports/widgets/qmldir
deleted file mode 100644
index 6f19878..0000000
--- a/src/imports/widgets/qmldir
+++ /dev/null
@@ -1 +0,0 @@
-plugin widgets
diff --git a/src/imports/widgets/widgets.cpp b/src/imports/widgets/widgets.cpp
deleted file mode 100644
index 20de1fe..0000000
--- a/src/imports/widgets/widgets.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include 
-#include 
-#include 
-
-#include "graphicslayouts_p.h"
-#include 
-QT_BEGIN_NAMESPACE
-
-class QWidgetsQmlModule : public QDeclarativeExtensionPlugin
-{
-    Q_OBJECT
-public:
-    virtual void registerTypes(const char *uri)
-    {
-        Q_ASSERT(QLatin1String(uri) == QLatin1String("Qt.widgets"));
-
-        qmlRegisterInterface("QGraphicsLayoutItem");
-        qmlRegisterInterface("QGraphicsLayout");
-        qmlRegisterType(uri,4,7,"QGraphicsLinearLayoutStretchItem");
-        qmlRegisterType(uri,4,7,"QGraphicsLinearLayout");
-        qmlRegisterType(uri,4,7,"QGraphicsGridLayout");
-    }
-};
-
-QT_END_NAMESPACE
-
-#include "widgets.moc"
-
-Q_EXPORT_PLUGIN2(qtwidgetsqmlmodule, QT_PREPEND_NAMESPACE(QWidgetsQmlModule));
-
diff --git a/src/imports/widgets/widgets.pro b/src/imports/widgets/widgets.pro
deleted file mode 100644
index 234ff1e..0000000
--- a/src/imports/widgets/widgets.pro
+++ /dev/null
@@ -1,30 +0,0 @@
-TARGET  = widgets
-TARGETPATH = Qt/widgets
-include(../qimportbase.pri)
-
-QT += declarative
-
-SOURCES += \
-    graphicslayouts.cpp \
-    widgets.cpp
-
-HEADERS += \
-    graphicslayouts_p.h
-
-QTDIR_build:DESTDIR = $$QT_BUILD_TREE/imports/$$TARGETPATH
-target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
-
-qmldir.files += $$PWD/qmldir
-qmldir.path +=  $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
-
-symbian:{
-    load(data_caging_paths)
-    include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
-    
-    importFiles.sources = widgets.dll qmldir
-    importFiles.path = $$QT_IMPORTS_BASE_DIR/$$TARGETPATH
-    
-    DEPLOYMENT = importFiles
-}
-
-INSTALLS += target qmldir
diff --git a/tests/auto/declarative/qdeclarativelayoutitem/data/layoutItem.qml b/tests/auto/declarative/qdeclarativelayoutitem/data/layoutItem.qml
new file mode 100644
index 0000000..ee881a2
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelayoutitem/data/layoutItem.qml
@@ -0,0 +1,9 @@
+import Qt 4.7
+
+LayoutItem {//Sized by the layout
+    id: resizable
+    objectName: "resizable"
+    minimumSize: "100x100"
+    maximumSize: "300x300"
+    preferredSize: "200x200"
+}
diff --git a/tests/auto/declarative/qdeclarativelayoutitem/qdeclarativelayoutitem.pro b/tests/auto/declarative/qdeclarativelayoutitem/qdeclarativelayoutitem.pro
new file mode 100644
index 0000000..eeb784d
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelayoutitem/qdeclarativelayoutitem.pro
@@ -0,0 +1,8 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative gui
+macx:CONFIG -= app_bundle
+
+SOURCES += tst_qdeclarativelayoutitem.cpp
+
+# Define SRCDIR equal to test's source directory
+DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qdeclarativelayoutitem/tst_qdeclarativelayoutitem.cpp b/tests/auto/declarative/qdeclarativelayoutitem/tst_qdeclarativelayoutitem.cpp
new file mode 100644
index 0000000..2207635
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelayoutitem/tst_qdeclarativelayoutitem.cpp
@@ -0,0 +1,115 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include "../../../shared/util.h"
+
+class tst_qdeclarativelayoutitem : public QObject
+{
+    Q_OBJECT
+public:
+    tst_qdeclarativelayoutitem();
+
+private slots:
+    void test_resizing();
+};
+
+tst_qdeclarativelayoutitem::tst_qdeclarativelayoutitem()
+{
+}
+
+void tst_qdeclarativelayoutitem::test_resizing()
+{
+    //Create Layout (must be done in C++)
+    QGraphicsView view;
+    QGraphicsScene scene;
+    QGraphicsWidget *widget = new QGraphicsWidget();
+    QGraphicsLinearLayout *layout = new QGraphicsLinearLayout();
+    widget->setLayout(layout);
+    scene.addItem(widget);
+    view.setScene(&scene);
+    //Add the QML snippet into the layout
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl(SRCDIR "/data/layoutItem.qml"));
+    QDeclarativeLayoutItem* obj = static_cast(c.create());
+    layout->addItem(obj);
+    layout->setContentsMargins(0,0,0,0);
+    widget->setContentsMargins(0,0,0,0);
+    view.show();
+
+    QVERIFY(obj!= 0);
+
+    widget->setGeometry(QRectF(0,0, 400,400));
+    QCOMPARE(obj->width(), 300.0);
+    QCOMPARE(obj->height(), 300.0);
+
+    widget->setGeometry(QRectF(0,0, 300,300));
+    QCOMPARE(obj->width(), 300.0);
+    QCOMPARE(obj->height(), 300.0);
+
+    widget->setGeometry(QRectF(0,0, 200,200));
+    QCOMPARE(obj->width(), 200.0);
+    QCOMPARE(obj->height(), 200.0);
+
+    widget->setGeometry(QRectF(0,0, 100,100));
+    QCOMPARE(obj->width(), 100.0);
+    QCOMPARE(obj->height(), 100.0);
+
+    widget->setGeometry(QRectF(0,0, 40,40));
+    QCOMPARE(obj->width(), 100.0);
+    QCOMPARE(obj->height(), 100.0);
+
+    widget->setGeometry(QRectF(0,0, 412,112));
+    QCOMPARE(obj->width(), 300.0);
+    QCOMPARE(obj->height(), 112.0);
+}
+
+
+QTEST_MAIN(tst_qdeclarativelayoutitem)
+
+#include "tst_qdeclarativelayoutitem.moc"
diff --git a/tests/auto/declarative/qdeclarativelayouts/data/layouts.qml b/tests/auto/declarative/qdeclarativelayouts/data/layouts.qml
deleted file mode 100644
index 0538738..0000000
--- a/tests/auto/declarative/qdeclarativelayouts/data/layouts.qml
+++ /dev/null
@@ -1,31 +0,0 @@
-import Qt 4.7
-import Qt.widgets 4.7
-
-Item {
-    id: resizable
-    width:300
-    height:300
-    QGraphicsWidget {
-        x : resizable.x
-        y : resizable.y
-        width : resizable.width
-        height : resizable.height
-        layout: QGraphicsLinearLayout {
-            spacing: 0
-            LayoutItem {
-                objectName: "left"
-                minimumSize: "100x100"
-                maximumSize: "300x300"
-                preferredSize: "100x100"
-                Rectangle { objectName: "yellowRect"; color: "yellow"; anchors.fill: parent }
-            }
-            LayoutItem {
-                objectName: "right"
-                minimumSize: "100x100"
-                maximumSize: "400x400"
-                preferredSize: "200x200"
-                Rectangle { objectName: "greenRect"; color: "green"; anchors.fill: parent }
-            }
-        }
-    }
-}
diff --git a/tests/auto/declarative/qdeclarativelayouts/qdeclarativelayouts.pro b/tests/auto/declarative/qdeclarativelayouts/qdeclarativelayouts.pro
deleted file mode 100644
index a2065f4..0000000
--- a/tests/auto/declarative/qdeclarativelayouts/qdeclarativelayouts.pro
+++ /dev/null
@@ -1,10 +0,0 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative
-SOURCES += tst_qdeclarativelayouts.cpp
-macx:CONFIG -= app_bundle
-
-# Define SRCDIR equal to test's source directory
-DEFINES += SRCDIR=\\\"$$PWD\\\"
-
-CONFIG += parallel_test
-
diff --git a/tests/auto/declarative/qdeclarativelayouts/tst_qdeclarativelayouts.cpp b/tests/auto/declarative/qdeclarativelayouts/tst_qdeclarativelayouts.cpp
deleted file mode 100644
index 412c3b7..0000000
--- a/tests/auto/declarative/qdeclarativelayouts/tst_qdeclarativelayouts.cpp
+++ /dev/null
@@ -1,147 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-class tst_QDeclarativeLayouts : public QObject
-{
-    Q_OBJECT
-public:
-    tst_QDeclarativeLayouts();
-
-private slots:
-    void test_qml();//GraphicsLayout set up in Qml
-    void test_cpp();//GraphicsLayout set up in C++
-
-private:
-    QDeclarativeView *createView(const QString &filename);
-};
-
-tst_QDeclarativeLayouts::tst_QDeclarativeLayouts()
-{
-}
-
-void tst_QDeclarativeLayouts::test_qml()
-{
-    QDeclarativeView *canvas = createView(SRCDIR "/data/layouts.qml");
-
-    qApp->processEvents();
-    QDeclarativeLayoutItem *left = static_cast(canvas->rootObject()->findChild("left"));
-    QVERIFY(left != 0);
-
-    QDeclarativeLayoutItem *right = static_cast(canvas->rootObject()->findChild("right"));
-    QVERIFY(right != 0);
-
-    qreal l = QApplication::style()->pixelMetric(QStyle::PM_LayoutLeftMargin);
-    qreal r = QApplication::style()->pixelMetric(QStyle::PM_LayoutRightMargin);
-    qreal t = QApplication::style()->pixelMetric(QStyle::PM_LayoutTopMargin);
-    qreal b = QApplication::style()->pixelMetric(QStyle::PM_LayoutBottomMargin);
-    QVERIFY2(l == r && r == t && t == b, "Test assumes equal margins.");
-    qreal gvMargin = l;
-
-    QDeclarativeItem *rootItem = qobject_cast(canvas->rootObject());
-    QVERIFY(rootItem != 0);
-
-    //Preferred Size
-    rootItem->setWidth(300 + 2*gvMargin);
-    rootItem->setHeight(300 + 2*gvMargin);
-
-    QCOMPARE(left->x(), gvMargin);
-    QCOMPARE(left->y(), gvMargin);
-    QCOMPARE(left->width(), 100.0);
-    QCOMPARE(left->height(), 300.0);
-
-    QCOMPARE(right->x(), 100.0 + gvMargin);
-    QCOMPARE(right->y(), 0.0 + gvMargin);
-    QCOMPARE(right->width(), 200.0);
-    QCOMPARE(right->height(), 300.0);
-
-    //Minimum Size
-    rootItem->setWidth(10+2*gvMargin);
-    rootItem->setHeight(10+2*gvMargin);
-
-    QCOMPARE(left->x(), gvMargin);
-    QCOMPARE(left->width(), 100.0);
-    QCOMPARE(left->height(), 100.0);
-
-    QCOMPARE(right->x(), 100.0 + gvMargin);
-    QCOMPARE(right->width(), 100.0);
-    QCOMPARE(right->height(), 100.0);
-
-    //Between preferred and Maximum Size
-    /*Note that if set to maximum size (or above) GraphicsLinearLayout behavior
-      is to shrink them down to preferred size. So the exact maximum size can't
-      be used*/
-    rootItem->setWidth(670 + 2*gvMargin);
-    rootItem->setHeight(300 + 2*gvMargin);
-
-    QCOMPARE(left->x(), gvMargin);
-    QCOMPARE(left->width(), 270.0);
-    QCOMPARE(left->height(), 300.0);
-
-    QCOMPARE(right->x(), 270.0 + gvMargin);
-    QCOMPARE(right->width(), 400.0);
-    QCOMPARE(right->height(), 300.0);
-
-    delete canvas;
-}
-
-void tst_QDeclarativeLayouts::test_cpp()
-{
-    //TODO: This test!
-}
-
-QDeclarativeView *tst_QDeclarativeLayouts::createView(const QString &filename)
-{
-    QDeclarativeView *canvas = new QDeclarativeView(0);
-    canvas->setSource(QUrl::fromLocalFile(filename));
-
-    return canvas;
-}
-
-
-QTEST_MAIN(tst_QDeclarativeLayouts)
-
-#include "tst_qdeclarativelayouts.moc"
-- 
cgit v0.12


From 39e992988f21553df7e839f36ced75ca5bf8588c Mon Sep 17 00:00:00 2001
From: Yann Bodson 
Date: Wed, 5 May 2010 18:06:20 +1000
Subject: Fix i18n example.

Add french translation to photoviewer demo.
---
 .../photoviewer/PhotoViewerCore/AlbumDelegate.qml  |   2 +-
 demos/declarative/photoviewer/i18n/base.ts         |  30 +++++++++++++++++++++
 demos/declarative/photoviewer/i18n/qml_fr.qm       | Bin 0 -> 268 bytes
 demos/declarative/photoviewer/i18n/qml_fr.ts       |  30 +++++++++++++++++++++
 demos/declarative/photoviewer/photoviewer.qml      |   6 ++---
 examples/declarative/i18n/i18n.qml                 |  30 ++++++++++++---------
 6 files changed, 81 insertions(+), 17 deletions(-)
 create mode 100644 demos/declarative/photoviewer/i18n/base.ts
 create mode 100644 demos/declarative/photoviewer/i18n/qml_fr.qm
 create mode 100644 demos/declarative/photoviewer/i18n/qml_fr.ts

diff --git a/demos/declarative/photoviewer/PhotoViewerCore/AlbumDelegate.qml b/demos/declarative/photoviewer/PhotoViewerCore/AlbumDelegate.qml
index 142735f..71d3cdc 100644
--- a/demos/declarative/photoviewer/PhotoViewerCore/AlbumDelegate.qml
+++ b/demos/declarative/photoviewer/PhotoViewerCore/AlbumDelegate.qml
@@ -56,7 +56,7 @@ Component {
 
             Tag {
                 anchors { horizontalCenter: parent.horizontalCenter; bottom: parent.bottom; bottomMargin: 10 }
-                frontLabel: tag; backLabel: "Delete"; flipped: mainWindow.editMode
+                frontLabel: tag; backLabel: qsTr("Remove"); flipped: mainWindow.editMode
                 onTagChanged: rssModel.tags = tag
                 onBackClicked: if (mainWindow.editMode) photosModel.remove(index);
             }
diff --git a/demos/declarative/photoviewer/i18n/base.ts b/demos/declarative/photoviewer/i18n/base.ts
new file mode 100644
index 0000000..1accfd2
--- /dev/null
+++ b/demos/declarative/photoviewer/i18n/base.ts
@@ -0,0 +1,30 @@
+
+
+
+
+    AlbumDelegate
+    
+        
+        Remove
+        
+    
+
+
+    photoviewer
+    
+        
+        Add
+        
+    
+    
+        
+        Edit
+        
+    
+    
+        
+        Back
+        
+    
+
+
diff --git a/demos/declarative/photoviewer/i18n/qml_fr.qm b/demos/declarative/photoviewer/i18n/qml_fr.qm
new file mode 100644
index 0000000..c24fcbc
Binary files /dev/null and b/demos/declarative/photoviewer/i18n/qml_fr.qm differ
diff --git a/demos/declarative/photoviewer/i18n/qml_fr.ts b/demos/declarative/photoviewer/i18n/qml_fr.ts
new file mode 100644
index 0000000..9f892db
--- /dev/null
+++ b/demos/declarative/photoviewer/i18n/qml_fr.ts
@@ -0,0 +1,30 @@
+
+
+
+
+    AlbumDelegate
+    
+        
+        Remove
+        Supprimer
+    
+
+
+    photoviewer
+    
+        
+        Add
+        Ajouter
+    
+    
+        
+        Edit
+        Éditer
+    
+    
+        
+        Back
+        Retour
+    
+
+
diff --git a/demos/declarative/photoviewer/photoviewer.qml b/demos/declarative/photoviewer/photoviewer.qml
index 4094294..e384f46 100644
--- a/demos/declarative/photoviewer/photoviewer.qml
+++ b/demos/declarative/photoviewer/photoviewer.qml
@@ -27,7 +27,7 @@ Rectangle {
     Column {
         spacing: 20; anchors { bottom: parent.bottom; right: parent.right; rightMargin: 20; bottomMargin: 20 }
         Button {
-            id: newButton; label: "New"; rotation: 3
+            id: newButton; label: qsTr("Add"); rotation: 3
             anchors.horizontalCenter: parent.horizontalCenter
             onClicked: {
                 mainWindow.editMode = false
@@ -36,7 +36,7 @@ Rectangle {
             }
         }
         Button {
-            id: deleteButton; label: "Delete"; rotation: -2;
+            id: deleteButton; label: qsTr("Edit"); rotation: -2;
             onClicked: mainWindow.editMode = !mainWindow.editMode
             anchors.horizontalCenter: parent.horizontalCenter
         }
@@ -49,7 +49,7 @@ Rectangle {
 
     ListView { anchors.fill: parent; model: albumVisualModel.parts.browser; interactive: false }
 
-    Button { id: backButton; label: "Back"; rotation: 3; x: parent.width - backButton.width - 6; y: -backButton.height - 8 }
+    Button { id: backButton; label: qsTr("Back"); rotation: 3; x: parent.width - backButton.width - 6; y: -backButton.height - 8 }
 
     Rectangle { id: photosShade; color: 'black'; width: parent.width; height: parent.height; opacity: 0; visible: opacity != 0.0 }
 
diff --git a/examples/declarative/i18n/i18n.qml b/examples/declarative/i18n/i18n.qml
index 3b1279a..c3030b2 100644
--- a/examples/declarative/i18n/i18n.qml
+++ b/examples/declarative/i18n/i18n.qml
@@ -6,8 +6,9 @@ import Qt 4.7
 //
 // The files are created/updated by running:
 //
-//   lupdate i18n.qml -ts i18n/*.ts
+//   lupdate i18n.qml -ts i18n/base.ts
 //
+// Translations for new languages are created by copying i18n/base.ts to i18n/qml_.ts
 // The .ts files can then be edited with Linguist:
 //
 //   linguist i18n/qml_fr.ts
@@ -16,18 +17,21 @@ import Qt 4.7
 //
 //   lrelease i18n/*.ts
 //
-// Translations for new languages are created by copying i18n/base.ts to i18n/qml_.ts
-// and editing the result with Linguist.
-//
 
-Column {
-    Text {
-        text: "If a translation is available for the system language (eg. Franch) then the string below will translated (eg. 'Bonjour'). Otherwise is will show 'Hello'."
-        width: 200
-        wrapMode: Text.WordWrap
-    }
-    Text {
-        text: qsTr("Hello")
-        font.pointSize: 25
+Rectangle {
+    width: 640; height: 480
+
+    Column {
+        anchors.fill: parent; spacing: 20
+
+        Text {
+            text: "If a translation is available for the system language (eg. French) then the string below will translated (eg. 'Bonjour'). Otherwise is will show 'Hello'."
+            width: parent.width; wrapMode: Text.WordWrap
+        }
+
+        Text {
+            text: qsTr("Hello")
+            font.pointSize: 25; anchors.horizontalCenter: parent.horizontalCenter
+        }
     }
 }
-- 
cgit v0.12


From 0e5924bc207d7de29b28fb223a2027d5d2d694fa Mon Sep 17 00:00:00 2001
From: Martin Smith 
Date: Wed, 5 May 2010 10:37:08 +0200
Subject: qdoc: Removed [module name] from class ref pages.

The module name is now a breadcrumb.
---
 tools/qdoc3/htmlgenerator.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp
index 801e199..3120473 100644
--- a/tools/qdoc3/htmlgenerator.cpp
+++ b/tools/qdoc3/htmlgenerator.cpp
@@ -1243,6 +1243,8 @@ void HtmlGenerator::generateClassLikeNode(const InnerNode *inner,
         subtitleText << "(" << Atom(Atom::AutoLink, fullTitle) << ")"
                      << Atom(Atom::LineBreak);
 
+#if 0
+    // No longer used because the modeule name is a breadcrumb.
     QString fixedModule = inner->moduleName();
     if (fixedModule == "Qt3SupportLight")
         fixedModule = "Qt3Support";
@@ -1263,6 +1265,7 @@ void HtmlGenerator::generateClassLikeNode(const InnerNode *inner,
             subtitleText << "]";
         }
     }
+#endif    
 
     generateHeader(title, inner, marker);
     sections = marker->sections(inner, CodeMarker::Summary, CodeMarker::Okay);
-- 
cgit v0.12


From a976ba471d35fd57857b05cee5fdb4d6aa64c961 Mon Sep 17 00:00:00 2001
From: Peter Hartmann 
Date: Wed, 5 May 2010 10:15:20 +0200
Subject: correct misleading note in configure on Windows

the option given in the note would not work if used as described.

Reviewed-by: Zeno Albisser
Task-number: QTBUG-2089
---
 configure.exe                    | Bin 1319424 -> 1318912 bytes
 tools/configure/configureapp.cpp |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.exe b/configure.exe
index 35116ff..161fa1d 100755
Binary files a/configure.exe and b/configure.exe differ
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index bfa7445..79864f8 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -3457,7 +3457,7 @@ void Configure::displayConfig()
         cout << "NOTE: When linking against OpenSSL, you can override the default" << endl;
         cout << "library names through OPENSSL_LIBS." << endl;
         cout << "For example:" << endl;
-        cout << "    configure -openssl-linked OPENSSL_LIBS='-lssleay32 -llibeay32'" << endl;
+        cout << "    configure -openssl-linked OPENSSL_LIBS=\"-lssleay32 -llibeay32\"" << endl;
     }
     if( dictionary[ "ZLIB_FORCED" ] == "yes" ) {
         QString which_zlib = "supplied";
-- 
cgit v0.12


From 6b02a101cb96dee4bc574ebec1f91c9243f278fb Mon Sep 17 00:00:00 2001
From: Jens Bache-Wiig 
Date: Wed, 5 May 2010 11:19:00 +0200
Subject: Some minor code cleanup

Removes unused code from gkt and cleanlooks.

Reviewed-by: Trust Me
---
 src/gui/styles/qcleanlooksstyle.cpp |  3 ---
 src/gui/styles/qgtkstyle.cpp        | 17 -----------------
 2 files changed, 20 deletions(-)

diff --git a/src/gui/styles/qcleanlooksstyle.cpp b/src/gui/styles/qcleanlooksstyle.cpp
index ba24d97..d9f7df0 100644
--- a/src/gui/styles/qcleanlooksstyle.cpp
+++ b/src/gui/styles/qcleanlooksstyle.cpp
@@ -1397,7 +1397,6 @@ void QCleanlooksStyle::drawControl(ControlElement element, const QStyleOption *o
                                                 dark.lighter(135), 60);
 
     QColor highlight = option->palette.highlight().color();
-    QColor highlightText = option->palette.highlightedText().color();
 
     switch(element) {
      case CE_RadioButton: //fall through
@@ -2723,7 +2722,6 @@ void QCleanlooksStyle::drawComplexControl(ComplexControl control, const QStyleOp
             {
                 // Fill title bar gradient
                 QColor titlebarColor = QColor(active ? highlight: palette.background().color());
-                QColor titleBarGradientStop(active ? highlight.darker(150): palette.background().color().darker(120));
                 QLinearGradient gradient(option->rect.center().x(), option->rect.top(),
                                          option->rect.center().x(), option->rect.bottom());
 
@@ -2986,7 +2984,6 @@ void QCleanlooksStyle::drawComplexControl(ComplexControl control, const QStyleOp
 
             painter->fillRect(option->rect, option->palette.background());
 
-            QRect rect = scrollBar->rect;
             QRect scrollBarSubLine = proxy()->subControlRect(control, scrollBar, SC_ScrollBarSubLine, widget);
             QRect scrollBarAddLine = proxy()->subControlRect(control, scrollBar, SC_ScrollBarAddLine, widget);
             QRect scrollBarSlider = proxy()->subControlRect(control, scrollBar, SC_ScrollBarSlider, widget);
diff --git a/src/gui/styles/qgtkstyle.cpp b/src/gui/styles/qgtkstyle.cpp
index 0988fd8..6c8d561 100644
--- a/src/gui/styles/qgtkstyle.cpp
+++ b/src/gui/styles/qgtkstyle.cpp
@@ -1163,7 +1163,6 @@ void QGtkStyle::drawPrimitive(PrimitiveElement element,
         if (const QStyleOptionTabBarBase *tbb
                 = qstyleoption_cast(option)) {
             QRect tabRect = tbb->rect;
-            QRegion region(tabRect);
             painter->save();
             painter->setPen(QPen(option->palette.dark().color().dark(110), 0));
             switch (tbb->shape) {
@@ -1245,8 +1244,6 @@ void QGtkStyle::drawComplexControl(ComplexControl control, const QStyleOptionCom
     else
         alphaCornerColor = mergedColors(option->palette.background().color(), darkOutline);
 
-    QPalette palette = option->palette;
-
     switch (control) {
 
     case CC_TitleBar:
@@ -1333,11 +1330,8 @@ void QGtkStyle::drawComplexControl(ComplexControl control, const QStyleOptionCom
 
             bool isEnabled = (comboBox->state & State_Enabled);
             bool focus = isEnabled && (comboBox->state & State_HasFocus);
-            QColor buttonShadow = option->palette.dark().color();
             GtkStateType state = gtkPainter.gtkState(option);
             int appears_as_list = !proxy()->styleHint(QStyle::SH_ComboBox_Popup, comboBox, widget);
-            QPixmap cache;
-            QString pixmapName;
             QStyleOptionComboBox comboBoxCopy = *comboBox;
             comboBoxCopy.rect = option->rect;
 
@@ -1345,8 +1339,6 @@ void QGtkStyle::drawComplexControl(ComplexControl control, const QStyleOptionCom
             QRect rect = option->rect;
             QRect arrowButtonRect = proxy()->subControlRect(CC_ComboBox, &comboBoxCopy,
                                                    SC_ComboBoxArrow, widget);
-            QRect editRect = proxy()->subControlRect(CC_ComboBox, &comboBoxCopy,
-                                            SC_ComboBoxEditField, widget);
 
             GtkShadowType shadow = (option->state & State_Sunken || option->state & State_On ) ?
                                    GTK_SHADOW_IN : GTK_SHADOW_OUT;
@@ -1414,9 +1406,6 @@ void QGtkStyle::drawComplexControl(ComplexControl control, const QStyleOptionCom
                 else if (option->state & State_MouseOver && comboBox->activeSubControls & SC_ComboBoxArrow)
                     buttonState = GTK_STATE_PRELIGHT;
 
-                QRect buttonrect = QRect(gtkToggleButton->allocation.x, gtkToggleButton->allocation.y,
-                                         gtkToggleButton->allocation.width, gtkToggleButton->allocation.height);
-
                 Q_ASSERT(gtkToggleButton);
                 gtkCachedPainter.paintBox( gtkToggleButton, "button", arrowButtonRect, buttonState,
                                      shadow, gtkToggleButton->style, buttonPath.toString() +
@@ -1436,8 +1425,6 @@ void QGtkStyle::drawComplexControl(ComplexControl control, const QStyleOptionCom
                 if (focus)
                     GTK_WIDGET_UNSET_FLAGS(gtkToggleButton, GTK_HAS_FOCUS);
 
-            QHashableLatin1Literal buttonPath = comboBox->editable ? QHashableLatin1Literal("GtkComboBoxEntry.GtkToggleButton")
-                                                : QHashableLatin1Literal("GtkComboBox.GtkToggleButton");
 
                 // Draw the separator between label and arrows
                 QHashableLatin1Literal vSeparatorPath = comboBox->editable
@@ -2557,7 +2544,6 @@ void QGtkStyle::drawControl(ControlElement element,
                                      d->gtkWidget("GtkMenu.GtkMenuItem");
 
             style = gtkPainter.getStyle(gtkMenuItem);
-            QColor borderColor = option->palette.background().color().darker(160);
             QColor shadow = option->palette.dark().color();
 
             if (menuItem->menuItemType == QStyleOptionMenuItem::Separator) {
@@ -2782,8 +2768,6 @@ void QGtkStyle::drawControl(ControlElement element,
 
             // Arrow
             if (menuItem->menuItemType == QStyleOptionMenuItem::SubMenu) {// draw sub menu arrow
-                QPoint buttonShift(pixelMetric(PM_ButtonShiftHorizontal, option, widget),
-                                   proxy()->pixelMetric(PM_ButtonShiftVertical, option, widget));
 
                 QFontMetrics fm(menuitem->font);
                 int arrow_size = fm.ascent() + fm.descent() - 2 * gtkMenuItem->style->ythickness;
@@ -3130,7 +3114,6 @@ QRect QGtkStyle::subControlRect(ComplexControl control, const QStyleOptionComple
     case CC_ComboBox:
         if (const QStyleOptionComboBox *box = qstyleoption_cast(option)) {
             // We employ the gtk widget to position arrows and separators for us
-            QString comboBoxPath = box->editable ? QLS("GtkComboBoxEntry") : QLS("GtkComboBox");
             GtkWidget *gtkCombo = box->editable ? d->gtkWidget("GtkComboBoxEntry")
                                                 : d->gtkWidget("GtkComboBox");
             d->gtk_widget_set_direction(gtkCombo, (option->direction == Qt::RightToLeft) ? GTK_TEXT_DIR_RTL : GTK_TEXT_DIR_LTR);
-- 
cgit v0.12


From 95a69f37ec156a2506b140e5e349bb7f68e112a5 Mon Sep 17 00:00:00 2001
From: Markus Goetz 
Date: Mon, 26 Apr 2010 14:33:05 +0200
Subject: QHostInfo: Immediately delete aborted lookup requests.

Reviewed-by: Thiago
---
 src/network/kernel/qhostinfo.cpp | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/network/kernel/qhostinfo.cpp b/src/network/kernel/qhostinfo.cpp
index f287630..fd39347 100644
--- a/src/network/kernel/qhostinfo.cpp
+++ b/src/network/kernel/qhostinfo.cpp
@@ -596,6 +596,23 @@ void QHostInfoLookupManager::abortLookup(int id)
         return;
 
     QMutexLocker locker(&this->mutex);
+
+    // is postponed? delete and return
+    for (int i = 0; i < postponedLookups.length(); i++) {
+        if (postponedLookups.at(i)->id == id) {
+            delete postponedLookups.takeAt(i);
+            return;
+        }
+    }
+
+    // is scheduled? delete and return
+    for (int i = 0; i < scheduledLookups.length(); i++) {
+        if (scheduledLookups.at(i)->id == id) {
+            delete scheduledLookups.takeAt(i);
+            return;
+        }
+    }
+
     if (!abortedLookups.contains(id))
         abortedLookups.append(id);
 }
-- 
cgit v0.12


From ff2b6ddfd2763b6b365c7466d51a1e2374e4bd4b Mon Sep 17 00:00:00 2001
From: Markus Goetz 
Date: Wed, 5 May 2010 12:37:21 +0200
Subject: QHostInfo: Emit postponed lookup results when finishing current

Reviewed-by: Thiago
---
 src/network/kernel/qhostinfo.cpp | 12 ++++++++++++
 src/network/kernel/qhostinfo_p.h |  2 ++
 2 files changed, 14 insertions(+)

diff --git a/src/network/kernel/qhostinfo.cpp b/src/network/kernel/qhostinfo.cpp
index fd39347..28a6c84 100644
--- a/src/network/kernel/qhostinfo.cpp
+++ b/src/network/kernel/qhostinfo.cpp
@@ -471,6 +471,18 @@ void QHostInfoRunnable::run()
     hostInfo.setLookupId(id);
     resultEmitter.emitResultsReady(hostInfo);
 
+    // now also iterate through the postponed ones
+    QMutableListIterator iterator(manager->postponedLookups);
+    while (iterator.hasNext()) {
+        QHostInfoRunnable* postponed = iterator.next();
+        if (toBeLookedUp == postponed->toBeLookedUp) {
+            // we can now emit
+            iterator.remove();
+            hostInfo.setLookupId(postponed->id);
+            postponed->resultEmitter.emitResultsReady(hostInfo);
+        }
+    }
+
     manager->lookupFinished(this);
 
     // thread goes back to QThreadPool
diff --git a/src/network/kernel/qhostinfo_p.h b/src/network/kernel/qhostinfo_p.h
index e11766b..af270d8 100644
--- a/src/network/kernel/qhostinfo_p.h
+++ b/src/network/kernel/qhostinfo_p.h
@@ -173,6 +173,8 @@ public:
     bool wasAborted(int id);
 
     QHostInfoCache cache;
+
+    friend class QHostInfoRunnable;
 protected:
     QList currentLookups; // in progress
     QList postponedLookups; // postponed because in progress for same host
-- 
cgit v0.12


From 260212083c19e76e8e53dfe2ae44de70003769d7 Mon Sep 17 00:00:00 2001
From: Markus Goetz 
Date: Wed, 5 May 2010 14:13:24 +0200
Subject: QHostInfo: Avoid one tiny copy of QHostInfo object when emitting

Thanks rittk!

Reviewed-by: Olivier
---
 src/network/kernel/qhostinfo_p.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/network/kernel/qhostinfo_p.h b/src/network/kernel/qhostinfo_p.h
index af270d8..85d14c2 100644
--- a/src/network/kernel/qhostinfo_p.h
+++ b/src/network/kernel/qhostinfo_p.h
@@ -84,7 +84,7 @@ public Q_SLOTS:
     }
 
 Q_SIGNALS:
-    void resultsReady(const QHostInfo info);
+    void resultsReady(const QHostInfo &info);
 };
 
 // needs to be QObject because fromName calls tr()
-- 
cgit v0.12


From 6bc32600d2367e78ddc39dd93694e01d4d75958d Mon Sep 17 00:00:00 2001
From: "Bradley T. Hughes" 
Date: Wed, 5 May 2010 13:59:31 +0200
Subject: Don't leak QVistaHelper from QWizard

The default QObject constructor was not called, meaning the vista helper
was never registered as a child of the QWizard (and therefore never
deleted when the QWizard was destructed).

Task-number: QTBUG-10203
Reviewed-by: olivier
---
 src/gui/dialogs/qwizard_win.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gui/dialogs/qwizard_win.cpp b/src/gui/dialogs/qwizard_win.cpp
index 1390b21..e406cba 100644
--- a/src/gui/dialogs/qwizard_win.cpp
+++ b/src/gui/dialogs/qwizard_win.cpp
@@ -237,7 +237,8 @@ void QVistaBackButton::paintEvent(QPaintEvent *)
 */
 
 QVistaHelper::QVistaHelper(QWizard *wizard)
-    : pressed(false)
+    : QObject(wizard)
+    , pressed(false)
     , wizard(wizard)
     , backButton_(0)
 {
-- 
cgit v0.12


From bfbf4d4ccdfb4cf35592c61674f6bffc28932787 Mon Sep 17 00:00:00 2001
From: Daniel Molkentin 
Date: Wed, 5 May 2010 13:57:29 +0200
Subject: Fix build key on Windows with MinGW.

Also, rebuilt configure.exe

Reviewed-by: Thiago Macieira
---
 configure.exe                    | Bin 1318912 -> 1318912 bytes
 tools/configure/configureapp.cpp |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.exe b/configure.exe
index 161fa1d..69e98dd 100755
Binary files a/configure.exe and b/configure.exe differ
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 79864f8..e264426 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -2373,7 +2373,7 @@ void Configure::generateBuildKey()
                        + buildSymbianKey + "\"\n"
                        "#else\n"
                        // Debug builds
-                       "# if (defined(_DEBUG) || defined(DEBUG))\n"
+                       "# if (!QT_NO_DEBUG)\n"
                        "#  if (defined(WIN64) || defined(_WIN64) || defined(__WIN64__))\n"
                        + build64Key.arg("debug") + "\"\n"
                        "#  else\n"
-- 
cgit v0.12


From b4bbb3d79a59c1225e1de58b6625f24de7df2013 Mon Sep 17 00:00:00 2001
From: Martin Smith 
Date: Wed, 5 May 2010 15:26:47 +0200
Subject: doc: Began reorganization of the top doc page.

Much more to come.
---
 doc/src/frameworks-technologies/animation.qdoc     |  1 +
 .../frameworks-technologies/eventsandfilters.qdoc  |  3 ++-
 doc/src/frameworks-technologies/graphicsview.qdoc  |  1 +
 .../model-view-programming.qdoc                    |  1 +
 doc/src/frameworks-technologies/threads.qdoc       |  1 +
 doc/src/objectmodel/metaobjects.qdoc               |  3 ++-
 doc/src/objectmodel/object.qdoc                    |  3 ++-
 doc/src/objectmodel/objecttrees.qdoc               |  3 ++-
 doc/src/objectmodel/properties.qdoc                |  3 ++-
 doc/src/objectmodel/signalsandslots.qdoc           |  3 ++-
 doc/src/overviews.qdoc                             | 23 ++++++++++++++++++++++
 doc/src/painting-and-printing/paintsystem.qdoc     |  1 +
 doc/src/widgets-and-layouts/layout.qdoc            |  1 +
 doc/src/widgets-and-layouts/styles.qdoc            |  1 +
 doc/src/widgets-and-layouts/widgets.qdoc           |  1 +
 doc/src/windows-and-dialogs/dialogs.qdoc           |  1 +
 doc/src/windows-and-dialogs/mainwindow.qdoc        |  1 +
 tools/qdoc3/test/qt-html-templates.qdocconf        | 19 ++++++------------
 18 files changed, 51 insertions(+), 19 deletions(-)

diff --git a/doc/src/frameworks-technologies/animation.qdoc b/doc/src/frameworks-technologies/animation.qdoc
index 5548b57..dc705ba 100644
--- a/doc/src/frameworks-technologies/animation.qdoc
+++ b/doc/src/frameworks-technologies/animation.qdoc
@@ -47,6 +47,7 @@
 /*!
     \page animation-overview.html
     \title The Animation Framework
+    \ingroup qt-gui-concepts
 
     \brief An overview of the Animation Framework
 
diff --git a/doc/src/frameworks-technologies/eventsandfilters.qdoc b/doc/src/frameworks-technologies/eventsandfilters.qdoc
index 96ee18c..0cd60b8 100644
--- a/doc/src/frameworks-technologies/eventsandfilters.qdoc
+++ b/doc/src/frameworks-technologies/eventsandfilters.qdoc
@@ -54,7 +54,8 @@
 
 /*!
     \page eventsandfilters.html
-    \title Events and Event Filters
+    \title The Event System
+    \ingroup qt-basic-concepts
     \brief A guide to event handling in Qt.
 
     \ingroup frameworks-technologies
diff --git a/doc/src/frameworks-technologies/graphicsview.qdoc b/doc/src/frameworks-technologies/graphicsview.qdoc
index 6844aed..95b3182 100644
--- a/doc/src/frameworks-technologies/graphicsview.qdoc
+++ b/doc/src/frameworks-technologies/graphicsview.qdoc
@@ -47,6 +47,7 @@
 /*!
     \page graphicsview.html
     \title The Graphics View Framework
+    \ingroup qt-gui-concepts
     \brief An overview of the Graphics View framework for interactive 2D
     graphics.
 
diff --git a/doc/src/frameworks-technologies/model-view-programming.qdoc b/doc/src/frameworks-technologies/model-view-programming.qdoc
index 7568981..e02f1eb 100644
--- a/doc/src/frameworks-technologies/model-view-programming.qdoc
+++ b/doc/src/frameworks-technologies/model-view-programming.qdoc
@@ -50,6 +50,7 @@
     \startpage index.html Qt Reference Documentation
 
     \title Model/View Programming
+    \ingroup qt-gui-concepts
     \brief A guide to the extensible model/view architecture used by Qt's
     item view classes.
 
diff --git a/doc/src/frameworks-technologies/threads.qdoc b/doc/src/frameworks-technologies/threads.qdoc
index fd6bebb..f7dde59 100644
--- a/doc/src/frameworks-technologies/threads.qdoc
+++ b/doc/src/frameworks-technologies/threads.qdoc
@@ -47,6 +47,7 @@
 /*!
     \page threads.html
     \title Thread Support in Qt
+    \ingroup qt-basic-concepts
     \brief A detailed discussion of thread handling in Qt.
 
     \ingroup frameworks-technologies
diff --git a/doc/src/objectmodel/metaobjects.qdoc b/doc/src/objectmodel/metaobjects.qdoc
index c1b0ea6..e891183 100644
--- a/doc/src/objectmodel/metaobjects.qdoc
+++ b/doc/src/objectmodel/metaobjects.qdoc
@@ -41,7 +41,8 @@
 
 /*!
     \page metaobjects.html
-    \title Meta-Object System
+    \title The Meta-Object System
+    \ingroup qt-basic-concepts
     \brief An overview of Qt's meta-object system and introspection capabilities.
     \keyword meta-object
 
diff --git a/doc/src/objectmodel/object.qdoc b/doc/src/objectmodel/object.qdoc
index 2f06004..e0ba6ed 100644
--- a/doc/src/objectmodel/object.qdoc
+++ b/doc/src/objectmodel/object.qdoc
@@ -41,7 +41,8 @@
 
 /*!
     \page object.html
-    \title Qt Object Model
+    \title Object Model
+    \ingroup qt-basic-concepts
     \brief A description of the powerful features made possible by Qt's dynamic object model.
 
     \ingroup frameworks-technologies
diff --git a/doc/src/objectmodel/objecttrees.qdoc b/doc/src/objectmodel/objecttrees.qdoc
index 11824ae..97d646a 100644
--- a/doc/src/objectmodel/objecttrees.qdoc
+++ b/doc/src/objectmodel/objecttrees.qdoc
@@ -41,7 +41,8 @@
 
 /*!
     \page objecttrees.html
-    \title Object Trees and Object Ownership
+    \title Object Trees & Ownership
+    \ingroup qt-basic-concepts
     \brief Information about the parent-child pattern used to describe
     object ownership in Qt.
 
diff --git a/doc/src/objectmodel/properties.qdoc b/doc/src/objectmodel/properties.qdoc
index a807caf..bc9554c 100644
--- a/doc/src/objectmodel/properties.qdoc
+++ b/doc/src/objectmodel/properties.qdoc
@@ -41,7 +41,8 @@
 
 /*!
     \page properties.html
-    \title Qt's Property System
+    \title The Property System
+    \ingroup qt-basic-concepts
     \brief An overview of Qt's property system.
 
     Qt provides a sophisticated property system similar to the ones
diff --git a/doc/src/objectmodel/signalsandslots.qdoc b/doc/src/objectmodel/signalsandslots.qdoc
index 0f3f618..f33badf 100644
--- a/doc/src/objectmodel/signalsandslots.qdoc
+++ b/doc/src/objectmodel/signalsandslots.qdoc
@@ -41,7 +41,8 @@
 
 /*!
     \page signalsandslots.html
-    \title Signals and Slots
+    \title Signals & Slots
+    \ingroup qt-basic-concepts
     \brief An overview of Qt's signals and slots inter-object
     communication mechanism.
 
diff --git a/doc/src/overviews.qdoc b/doc/src/overviews.qdoc
index 7302e30..bc994af 100644
--- a/doc/src/overviews.qdoc
+++ b/doc/src/overviews.qdoc
@@ -48,6 +48,29 @@
 */
 
 /*!
+    \group qt-basic-concepts
+    \title Qt Basic Concepts
+
+    \brief The basic concepts of the Qt cross-platform application and UI framework.
+
+    Qt is a cross-platform application and UI framework for writing
+    web-enabled applications for desktop, mobile, and embedded
+    operating systems. These pages explain basic architectural
+    concepts of Qt:
+
+    \generatelist {related}
+ */
+
+/*!
+    \group qt-gui-concepts
+    \title Qt GUI Components
+
+    \brief The Qt components for constructing graphical user intefaces.
+
+    \generatelist {related}
+ */
+
+/*!
     \group frameworks-technologies
     \title Frameworks and Technologies
 
diff --git a/doc/src/painting-and-printing/paintsystem.qdoc b/doc/src/painting-and-printing/paintsystem.qdoc
index 802751f..56b638c 100644
--- a/doc/src/painting-and-printing/paintsystem.qdoc
+++ b/doc/src/painting-and-printing/paintsystem.qdoc
@@ -61,6 +61,7 @@
 /*!
     \page paintsystem.html
     \title The Paint System
+    \ingroup qt-gui-concepts
     \ingroup frameworks-technologies
 
     Qt's paint system enables painting on screen and print devices
diff --git a/doc/src/widgets-and-layouts/layout.qdoc b/doc/src/widgets-and-layouts/layout.qdoc
index 0cfde22..2ca202f 100644
--- a/doc/src/widgets-and-layouts/layout.qdoc
+++ b/doc/src/widgets-and-layouts/layout.qdoc
@@ -47,6 +47,7 @@
 /*!
     \page layout.html
     \title Layout Management
+    \ingroup qt-gui-concepts
     \brief A tour of the standard layout managers and an introduction to custom
     layouts.
     
diff --git a/doc/src/widgets-and-layouts/styles.qdoc b/doc/src/widgets-and-layouts/styles.qdoc
index 9a28715..b4bec8c 100644
--- a/doc/src/widgets-and-layouts/styles.qdoc
+++ b/doc/src/widgets-and-layouts/styles.qdoc
@@ -48,6 +48,7 @@
 /*!
     \page style-reference.html
     \title Implementing Styles and Style Aware Widgets
+    \ingroup qt-gui-concepts
     \brief An overview of styles and the styling of widgets.
 
     \ingroup frameworks-technologies
diff --git a/doc/src/widgets-and-layouts/widgets.qdoc b/doc/src/widgets-and-layouts/widgets.qdoc
index 7bd27b6..ac0bf77 100644
--- a/doc/src/widgets-and-layouts/widgets.qdoc
+++ b/doc/src/widgets-and-layouts/widgets.qdoc
@@ -42,6 +42,7 @@
 /*!
     \page widgets-and-layouts.html
     \title Widgets and Layouts
+    \ingroup qt-gui-concepts
 
     \ingroup frameworks-technologies
 
diff --git a/doc/src/windows-and-dialogs/dialogs.qdoc b/doc/src/windows-and-dialogs/dialogs.qdoc
index acee0c5..0b0a842 100644
--- a/doc/src/windows-and-dialogs/dialogs.qdoc
+++ b/doc/src/windows-and-dialogs/dialogs.qdoc
@@ -52,6 +52,7 @@
 /*!
     \page dialogs.html
     \title Dialog Windows
+    \ingroup qt-gui-concepts
     \brief An overview over dialog windows.
     
     \previouspage The Application Main Window
diff --git a/doc/src/windows-and-dialogs/mainwindow.qdoc b/doc/src/windows-and-dialogs/mainwindow.qdoc
index 6adfa75..b282dab 100644
--- a/doc/src/windows-and-dialogs/mainwindow.qdoc
+++ b/doc/src/windows-and-dialogs/mainwindow.qdoc
@@ -47,6 +47,7 @@
 /*!
     \page application-windows.html
     \title Application Windows and Dialogs
+    \ingroup qt-gui-concepts
     \ingroup frameworks-technologies
 
     \nextpage The Application Main Window
diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf
index 00af376..48ecd2c 100644
--- a/tools/qdoc3/test/qt-html-templates.qdocconf
+++ b/tools/qdoc3/test/qt-html-templates.qdocconf
@@ -50,7 +50,7 @@ HTML.postheader         = " 
\n" \
 			  "              
All classes
\n" \
 			  "              
All functions
\n" \
 			  "              
All namespaces
\n" \
-			  "              
Platform specifics
\n" \
+			  "              
QML elements
\n" \
 			  "             \n" \
 			  "          
\n" \
 			  "          
\n" \
@@ -58,24 +58,17 @@ HTML.postheader         = " 
\n" \
 			  "        
\n" \
 			  "        
\n" \
 			  "          
\n" \
-			  "            API Topics
\n" \
+			  "            Qt Topics
\n" \
 			  "          
\n" \
 			  " \n " \
 			  " " \
 			  "            
\n" \
-			  "              
QObject model
\n" \
-			  "              
Signals & Slots
\n" \
-			  "              
Event handling
\n" \
+			  "              
Basic Concepts
\n" \
+			  "              
GUI Construction
\n" \
+			  "              
Platform specifics
\n" \
 			  "              
Qt Quick
\n" \
-			  "              
The main window
\n" \
-			  "              
Widgets & Layouts
\n" \
-			  "              
Dialog windows
\n" \
-			  "              
The paint system
\n" \
-			  "              
Graphics views
\n" \
-			  "              
Model/View programming
\n" \
-			  "              
Widget style & layout
\n" \
 			  "            
  \n" \
 			  "          
\n" \
 			  "          
\n" \
@@ -83,7 +76,7 @@ HTML.postheader         = " 
\n" \
 			  "        
\n" \
 			  "        
\n" \
 			  "          
\n" \
-			  "            API Examples
\n" \
+			  "            Qt Examples\n" \
 			  "          
\n" \
 			  " \n " \
-			  " " \
-			  "          
\n" \
-			  "              
All modules
\n" \
-			  "              
All classes
\n" \
-			  "              
All functions
\n" \
-			  "              
All namespaces
\n" \
-			  "              
QML elements
\n" \
+			  "          
\n" \
+			  "              
All modules
\n" \
+			  "              
All classes
\n" \
+			  "              
All functions
\n" \
+			  "              
All namespaces
\n" \
+			  "              
Platform specifics
\n" \
 			  "            
 \n" \
 			  "          
\n" \
 			  "          
\n" \
@@ -58,17 +54,20 @@ HTML.postheader         = " 
\n" \
 			  "        
\n" \
 			  "        
\n" \
 			  "          
\n" \
-			  "            Qt Topics
\n" \
+			  "            API Topics\n" \
 			  "          
\n" \
-			  " \n " \
-			  " " \
-			  "            
\n" \
-			  "              
Basic Concepts
\n" \
-			  "              
GUI Construction
\n" \
-			  "              
Platform specifics
\n" \
-			  "              
Qt Quick
\n" \
+			  "            
\n" \
+			  "              
QObject model
\n" \
+			  "              
Signals & Slots
\n" \
+			  "              
Event handling
\n" \
+			  "              
Qt Quick
\n" \
+			  "              
The main window
\n" \
+			  "              
Widgets & Layouts
\n" \
+			  "              
Dialog windows
\n" \
+			  "              
The paint system
\n" \
+			  "              
Graphics views
\n" \
+			  "              
Model/View programming
\n" \
+			  "              
Widget style & layout
\n" \
 			  "            
  \n" \
 			  "          
\n" \
 			  "          
\n" \
@@ -76,18 +75,14 @@ HTML.postheader         = " 
\n" \
 			  "        
\n" \
 			  "        
\n" \
 			  "          
\n" \
-			  "            Qt Examples
\n" \
+			  "            API Examples\n" \
 			  "          
\n" \
-			  "  \n " \
-			  " " \
-			  "        
\n" \
-			  "              
All examples
\n" \
-			  "              
All tutorials
\n" \
-			  "              
Qt Quick examples
\n" \
-			  "              
Desktop examples
\n" \
-			  "              
Device examples
\n" \
+			  "        
\n" \
+			  "              
All examples
\n" \
+			  "              
All tutorials
\n" \
+			  "              
Qt Quick examples
\n" \
+			  "              
Desktop examples
\n" \
+			  "              
Device examples
\n" \
 			  "            
 \n" \
 			  "          
\n" \
 			  "          
\n" \
-- 
cgit v0.12


From db64d17f233f92ce7a425271ee60586bd846705d Mon Sep 17 00:00:00 2001
From: Thiago Macieira 
Date: Wed, 5 May 2010 16:34:38 +0200
Subject: whitespace fixes

---
 tests/auto/qnetworkreply/tst_qnetworkreply.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
index ff79c09..db8548d 100644
--- a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
+++ b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
@@ -522,8 +522,8 @@ public:
         active->connectToHost("127.0.0.1", server.serverPort());
 #ifndef Q_OS_SYMBIAN
         // need more time as working with embedded
-		// device and testing from emualtor
-		// things tend to get slower
+        // device and testing from emualtor
+        // things tend to get slower
         if (!active->waitForConnected(1000))
             return false;
 
@@ -929,7 +929,7 @@ void tst_QNetworkReply::invalidProtocol()
 
 void tst_QNetworkReply::getFromData_data()
 {
-	QTest::addColumn("request");
+    QTest::addColumn("request");
     QTest::addColumn("expected");
     QTest::addColumn("mimeType");
 
@@ -1025,7 +1025,7 @@ void tst_QNetworkReply::getFromData()
 
 void tst_QNetworkReply::getFromFile()
 {
-	// create the file:
+    // create the file:
     QTemporaryFile file(QDir::currentPath() + "/temp-XXXXXX");
     file.setAutoRemove(true);
     QVERIFY(file.open());
@@ -1077,7 +1077,7 @@ void tst_QNetworkReply::getFromFileSpecial_data()
 
 void tst_QNetworkReply::getFromFileSpecial()
 {
-	QFETCH(QString, fileName);
+    QFETCH(QString, fileName);
     QFETCH(QString, url);
 
     // open the resource so we can find out its size
@@ -1107,7 +1107,7 @@ void tst_QNetworkReply::getFromFtp_data()
 
 void tst_QNetworkReply::getFromFtp()
 {
-	QFETCH(QString, referenceName);
+    QFETCH(QString, referenceName);
     QFETCH(QString, url);
 
     QFile reference(referenceName);
@@ -1136,7 +1136,7 @@ void tst_QNetworkReply::getFromHttp_data()
 
 void tst_QNetworkReply::getFromHttp()
 {
-	QFETCH(QString, referenceName);
+    QFETCH(QString, referenceName);
     QFETCH(QString, url);
 
     QFile reference(referenceName);
@@ -3456,8 +3456,8 @@ void tst_QNetworkReply::downloadProgress_data()
     QTest::newRow("big") << 4096;
 #else
     // it can run even with 4096
-	// but it takes lot time
-	//especially on emulator
+    // but it takes lot time
+    //especially on emulator
     QTest::newRow("big") << 1024;
 #endif
 }
@@ -3646,7 +3646,7 @@ void tst_QNetworkReply::receiveCookiesFromHttp_data()
 
 void tst_QNetworkReply::receiveCookiesFromHttp()
 {
-	QFETCH(QString, cookieString);
+    QFETCH(QString, cookieString);
 
     QByteArray data = cookieString.toLatin1() + '\n';
     QUrl url("http://" + QtNetworkSettings::serverName() + "/qtest/cgi-bin/set-cookie.cgi");
-- 
cgit v0.12


From e41217d6d2e592e79a9a8a83c9e49491d66ad18e Mon Sep 17 00:00:00 2001
From: Thiago Macieira 
Date: Wed, 5 May 2010 16:36:10 +0200
Subject: tst_qnetworkreply: add a test for getting from SMB

Reviewed-By: Markus Goetz
---
 tests/auto/qnetworkreply/smb-file.txt          | 1 +
 tests/auto/qnetworkreply/tst_qnetworkreply.cpp | 3 +++
 2 files changed, 4 insertions(+)
 create mode 100644 tests/auto/qnetworkreply/smb-file.txt

diff --git a/tests/auto/qnetworkreply/smb-file.txt b/tests/auto/qnetworkreply/smb-file.txt
new file mode 100644
index 0000000..73c3ac2
--- /dev/null
+++ b/tests/auto/qnetworkreply/smb-file.txt
@@ -0,0 +1 @@
+This is 34 bytes. Do not change...
\ No newline at end of file
diff --git a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
index db8548d..9d942bf 100644
--- a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
+++ b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
@@ -1073,6 +1073,9 @@ void tst_QNetworkReply::getFromFileSpecial_data()
     QTest::newRow("resource") << ":/resource" <<  "qrc:/resource";
     QTest::newRow("search-path") << "srcdir:/rfc3252.txt" << "srcdir:/rfc3252.txt";
     QTest::newRow("bigfile-path") << "srcdir:/bigfile" << "srcdir:/bigfile";
+#ifdef Q_OS_WIN
+    QTest::newRow("smb-path") << "srcdir:/smb-file.txt" << "file://" + QtNetworkSettings::winServerName() + "/testshare/test.pri";
+#endif
 }
 
 void tst_QNetworkReply::getFromFileSpecial()
-- 
cgit v0.12


From a2f797b52c4274a62a7cf1f0939aca1429afe211 Mon Sep 17 00:00:00 2001
From: Thiago Macieira 
Date: Wed, 5 May 2010 16:48:21 +0200
Subject: Improve QUrl handling of local file paths

Add QUrl::isLocalFile for a faster and more consistent checking of
whether the URL is local or not.

Improve the documentation to indicate that QUrl always treats SMB-like
file paths as local, even if the system cannot open them
(non-Windows).

Add a test to ensure that "FILE:/a.txt" is considered local too (RFC
3986 requires schemes to be interpreted in case-insensitive fashion).

Remove broken code that supported empty schemes as local file paths.

Reviewed-by: Markus Goetz
---
 src/corelib/io/qurl.cpp      | 73 +++++++++++++++++++++++++++++++-------------
 src/corelib/io/qurl.h        |  1 +
 tests/auto/qurl/tst_qurl.cpp | 11 ++++++-
 3 files changed, 62 insertions(+), 23 deletions(-)

diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp
index 4e580dd..7b5bfed 100644
--- a/src/corelib/io/qurl.cpp
+++ b/src/corelib/io/qurl.cpp
@@ -5970,19 +5970,22 @@ bool QUrl::isDetached() const
 
 
 /*!
-    Returns a QUrl representation of \a localFile, interpreted as a
-    local file.
+    Returns a QUrl representation of \a localFile, interpreted as a local
+    file. This function accepts paths separated by slashes as well as the
+    native separator for this platform.
 
-    \sa toLocalFile()
+    This function also accepts paths with a doubled leading slash (or
+    backslash) to indicate a remote file, as in
+    "//servername/path/to/file.txt". Note that only certain platforms can
+    actually open this file using QFile::open().
+
+    \sa toLocalFile(), isLocalFile(), QDir::toNativeSeparators
 */
 QUrl QUrl::fromLocalFile(const QString &localFile)
 {
     QUrl url;
     url.setScheme(QLatin1String("file"));
-    QString deslashified = localFile;
-    deslashified.replace(QLatin1Char('\\'), QLatin1Char('/'));
-
-
+    QString deslashified = QDir::toNativeSeparators(localFile);
 
     // magic for drives on windows
     if (deslashified.length() > 1 && deslashified.at(1) == QLatin1Char(':') && deslashified.at(0) != QLatin1Char('/')) {
@@ -6001,35 +6004,61 @@ QUrl QUrl::fromLocalFile(const QString &localFile)
 }
 
 /*!
-    Returns the path of this URL formatted as a local file path.
+    Returns the path of this URL formatted as a local file path. The path
+    returned will use forward slashes, even if it was originally created
+    from one with backslashes.
 
-    \sa fromLocalFile()
+    If this URL contains a non-empty hostname, it will be encoded in the
+    returned value in the form found on SMB networks (for example,
+    "//servername/path/to/file.txt").
+
+    \sa fromLocalFile(), isLocalFile()
 */
 QString QUrl::toLocalFile() const
 {
-    if (!d) return QString();
-    if (!QURL_HASFLAG(d->stateFlags, QUrlPrivate::Parsed)) d->parse();
+    // the call to isLocalFile() also ensures that we're parsed
+    if (!isLocalFile())
+        return QString();
 
     QString tmp;
     QString ourPath = path();
-    if (d->scheme.isEmpty() || QString::compare(d->scheme, QLatin1String("file"), Qt::CaseInsensitive) == 0) {
 
-        // magic for shared drive on windows
-        if (!d->host.isEmpty()) {
-            tmp = QLatin1String("//") + d->host + (ourPath.length() > 0 && ourPath.at(0) != QLatin1Char('/')
-                                                  ? QLatin1Char('/') + ourPath :  ourPath);
-        } else {
-            tmp = ourPath;
-            // magic for drives on windows
-            if (ourPath.length() > 2 && ourPath.at(0) == QLatin1Char('/') && ourPath.at(2) == QLatin1Char(':'))
-                tmp.remove(0, 1);
-        }
+    // magic for shared drive on windows
+    if (!d->host.isEmpty()) {
+        tmp = QLatin1String("//") + d->host + (ourPath.length() > 0 && ourPath.at(0) != QLatin1Char('/')
+                                               ? QLatin1Char('/') + ourPath :  ourPath);
+    } else {
+        tmp = ourPath;
+        // magic for drives on windows
+        if (ourPath.length() > 2 && ourPath.at(0) == QLatin1Char('/') && ourPath.at(2) == QLatin1Char(':'))
+            tmp.remove(0, 1);
     }
 
     return tmp;
 }
 
 /*!
+    \since 4.7
+    Returns true if this URL is pointing to a local file path. A URL is a
+    local file path if the scheme is "file".
+
+    Note that this function considers URLs with hostnames to be local file
+    paths, even if the eventual file path cannot be opened with
+    QFile::open().
+
+    \sa fromLocalFile(), toLocalFile()
+*/
+bool QUrl::isLocalFile() const
+{
+    if (!d) return false;
+    if (!QURL_HASFLAG(d->stateFlags, QUrlPrivate::Parsed)) d->parse();
+
+    if (d->scheme.compare(QLatin1String("file"), Qt::CaseInsensitive) != 0)
+        return false;   // not file
+    return true;
+}
+
+/*!
     Returns true if this URL is a parent of \a childUrl. \a childUrl is a child
     of this URL if the two URLs share the same scheme and authority,
     and this URL's path is a parent of the path of \a childUrl.
diff --git a/src/corelib/io/qurl.h b/src/corelib/io/qurl.h
index 6f8331a..162aa7c 100644
--- a/src/corelib/io/qurl.h
+++ b/src/corelib/io/qurl.h
@@ -183,6 +183,7 @@ public:
 
     static QUrl fromLocalFile(const QString &localfile);
     QString toLocalFile() const;
+    bool isLocalFile() const;
 
     QString toString(FormattingOptions options = None) const;
 
diff --git a/tests/auto/qurl/tst_qurl.cpp b/tests/auto/qurl/tst_qurl.cpp
index fa42adc..67bf0c1 100644
--- a/tests/auto/qurl/tst_qurl.cpp
+++ b/tests/auto/qurl/tst_qurl.cpp
@@ -314,6 +314,7 @@ void tst_QUrl::constructing()
 
 
     QUrl buildUNC;
+    buildUNC.setScheme(QString::fromLatin1("file"));
     buildUNC.setHost(QString::fromLatin1("somehost"));
     buildUNC.setPath(QString::fromLatin1("somepath"));
     QCOMPARE(buildUNC.toLocalFile(), QString::fromLatin1("//somehost/somepath"));
@@ -1757,7 +1758,15 @@ void tst_QUrl::toLocalFile_data()
     QTest::newRow("data7")	<< QString::fromLatin1("file://somehost/") << QString::fromLatin1("//somehost/");
     QTest::newRow("data8")	<< QString::fromLatin1("file://somehost") << QString::fromLatin1("//somehost");
     QTest::newRow("data9")	<< QString::fromLatin1("file:////somehost/somedir/somefile") << QString::fromLatin1("//somehost/somedir/somefile");
-
+    QTest::newRow("data10")	<< QString::fromLatin1("FILE:/a.txt") << QString::fromLatin1("/a.txt");
+
+    // and some that result in empty (i.e., not local)
+    QTest::newRow("xdata0") << QString::fromLatin1("/a.txt") << QString();
+    QTest::newRow("xdata1") << QString::fromLatin1("//a.txt") << QString();
+    QTest::newRow("xdata2") << QString::fromLatin1("///a.txt") << QString();
+    QTest::newRow("xdata3") << QString::fromLatin1("foo:/a.txt") << QString();
+    QTest::newRow("xdata4") << QString::fromLatin1("foo://a.txt") << QString();
+    QTest::newRow("xdata5") << QString::fromLatin1("foo:///a.txt") << QString();
 }
 
 void tst_QUrl::toLocalFile()
-- 
cgit v0.12


From ebddf7a8739d7f4aaa7d9cb8a41a14eebb65e4f4 Mon Sep 17 00:00:00 2001
From: Thiago Macieira 
Date: Wed, 5 May 2010 16:51:41 +0200
Subject: Use QUrl::isLocalFile and fix the scheme checking in local URLs.

RFC 3986 requires that schemes be compared case-insensitively, so
"QRC:/" is allowed for Qt resources.

Also document the use of file engines and search paths.

Reviewed-by: Markus Goetz
---
 src/network/access/qnetworkaccessfilebackend.cpp | 11 ++++++++---
 src/network/access/qnetworkaccessmanager.cpp     | 11 +++++------
 tests/auto/qnetworkreply/tst_qnetworkreply.cpp   |  6 ++++++
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/network/access/qnetworkaccessfilebackend.cpp b/src/network/access/qnetworkaccessfilebackend.cpp
index 4560153..710c258 100644
--- a/src/network/access/qnetworkaccessfilebackend.cpp
+++ b/src/network/access/qnetworkaccessfilebackend.cpp
@@ -65,10 +65,15 @@ QNetworkAccessFileBackendFactory::create(QNetworkAccessManager::Operation op,
     }
 
     QUrl url = request.url();
-    if (url.scheme() == QLatin1String("qrc") || !url.toLocalFile().isEmpty())
+    if (url.scheme().compare(QLatin1String("qrc"), Qt::CaseInsensitive) == 0 || url.isLocalFile()) {
         return new QNetworkAccessFileBackend;
-    else if (!url.isEmpty() && url.authority().isEmpty()) {
-        // check if QFile could, in theory, open this URL
+    } else if (!url.scheme().isEmpty() && url.authority().isEmpty()) {
+        // check if QFile could, in theory, open this URL via the file engines
+        // it has to be in the format:
+        //    prefix:path/to/file
+        // or prefix:/path/to/file
+        //
+        // this construct here must match the one below in open()
         QFileInfo fi(url.toString(QUrl::RemoveAuthority | QUrl::RemoveFragment | QUrl::RemoveQuery));
         if (fi.exists() || (op == QNetworkAccessManager::PutOperation && fi.dir().exists()))
             return new QNetworkAccessFileBackend;
diff --git a/src/network/access/qnetworkaccessmanager.cpp b/src/network/access/qnetworkaccessmanager.cpp
index 1c7661d..10fdc6f 100644
--- a/src/network/access/qnetworkaccessmanager.cpp
+++ b/src/network/access/qnetworkaccessmanager.cpp
@@ -907,21 +907,20 @@ QNetworkReply *QNetworkAccessManager::createRequest(QNetworkAccessManager::Opera
 {
     Q_D(QNetworkAccessManager);
 
+    bool isLocalFile = req.url().isLocalFile();
+
     // fast path for GET on file:// URLs
-    // Also if the scheme is empty we consider it a file.
     // The QNetworkAccessFileBackend will right now only be used
     // for PUT or qrc://
     if ((op == QNetworkAccessManager::GetOperation || op == QNetworkAccessManager::HeadOperation)
-         && (req.url().scheme() == QLatin1String("file")
-             || req.url().scheme().isEmpty())) {
+         && isLocalFile) {
         return new QFileNetworkReply(this, req, op);
     }
 
 #ifndef QT_NO_BEARERMANAGEMENT
     // Return a disabled network reply if network access is disabled.
     // Except if the scheme is empty or file://.
-    if (!d->networkAccessible && !(req.url().scheme() == QLatin1String("file") ||
-                                      req.url().scheme().isEmpty())) {
+    if (!d->networkAccessible && !isLocalFile) {
         return new QDisabledNetworkReply(this, req, op);
     }
 
@@ -963,7 +962,7 @@ QNetworkReply *QNetworkAccessManager::createRequest(QNetworkAccessManager::Opera
     QUrl url = request.url();
     QNetworkReplyImpl *reply = new QNetworkReplyImpl(this);
 #ifndef QT_NO_BEARERMANAGEMENT
-    if (req.url().scheme() != QLatin1String("file") && !req.url().scheme().isEmpty()) {
+    if (!isLocalFile) {
         connect(this, SIGNAL(networkSessionConnected()),
                 reply, SLOT(_q_networkSessionConnected()));
     }
diff --git a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
index 9d942bf..c4d458f 100644
--- a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
+++ b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
@@ -1166,6 +1166,12 @@ void tst_QNetworkReply::getErrors_data()
     QTest::addColumn("httpStatusCode");
     QTest::addColumn("dataIsEmpty");
 
+    // empties
+    QTest::newRow("empty-url") << QString() << int(QNetworkReply::ProtocolUnknownError) << 0 << true;
+    QTest::newRow("empty-scheme-host") << SRCDIR "/rfc3252.txt" << int(QNetworkReply::ProtocolUnknownError) << 0 << true;
+    QTest::newRow("empty-scheme") << "//" + QtNetworkSettings::winServerName() + "/testshare/test.pri"
+            << int(QNetworkReply::ProtocolUnknownError) << 0 << true;
+
     // file: errors
     QTest::newRow("file-host") << "file://this-host-doesnt-exist.troll.no/foo.txt"
 #if !defined Q_OS_WIN
-- 
cgit v0.12


From a9fb306a1cf1308a3f8b9bb12ed01aed1f6f6f8d Mon Sep 17 00:00:00 2001
From: Thiago Macieira 
Date: Wed, 5 May 2010 16:55:02 +0200
Subject: [QNAM FTP] Check for the "ftp" scheme case-insensitively

---
 src/network/access/qnetworkaccessftpbackend.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/network/access/qnetworkaccessftpbackend.cpp b/src/network/access/qnetworkaccessftpbackend.cpp
index 1a59011..da336d0 100644
--- a/src/network/access/qnetworkaccessftpbackend.cpp
+++ b/src/network/access/qnetworkaccessftpbackend.cpp
@@ -77,7 +77,7 @@ QNetworkAccessFtpBackendFactory::create(QNetworkAccessManager::Operation op,
     }
 
     QUrl url = request.url();
-    if (url.scheme() == QLatin1String("ftp"))
+    if (url.scheme().compare(QLatin1String("ftp"), Qt::CaseInsensitive) == 0)
         return new QNetworkAccessFtpBackend;
     return 0;
 }
-- 
cgit v0.12


From 0a8379d9f01118d7ff0121e6ecbbc0307e1e7f63 Mon Sep 17 00:00:00 2001
From: Alan Alpert 
Date: Thu, 6 May 2010 04:54:19 +1000
Subject: Make component.createObject require a parent argument

For graphical objects (the common case) a common mistake is to not
parent a dynamically created item. Since you almost always want to add a
parent, and it's hard for a beginner to diagnose this problem, a parent
is now a required argument and dealt with by the createObject function.

Task-number: QTBUG-10110
---
 demos/declarative/samegame/SamegameCore/samegame.js  |  3 +--
 demos/declarative/snake/content/snake.js             |  6 ++----
 doc/src/declarative/dynamicobjects.qdoc              |  4 +++-
 doc/src/declarative/globalobject.qdoc                |  5 ++++-
 doc/src/snippets/declarative/componentCreation.js    |  8 ++------
 doc/src/snippets/declarative/dynamicObjects.qml      |  3 +--
 examples/declarative/dynamic/qml/itemCreation.js     |  3 +--
 .../tutorials/samegame/samegame2/samegame.js         |  3 +--
 .../tutorials/samegame/samegame3/samegame.js         |  3 +--
 .../tutorials/samegame/samegame4/content/samegame.js |  3 +--
 src/declarative/qml/qdeclarativecomponent.cpp        | 20 +++++++++++++++++++-
 src/declarative/qml/qdeclarativecomponent.h          |  2 +-
 .../qdeclarativeecmascript/data/dynamicCreation.qml  |  4 ++--
 13 files changed, 39 insertions(+), 28 deletions(-)

diff --git a/demos/declarative/samegame/SamegameCore/samegame.js b/demos/declarative/samegame/SamegameCore/samegame.js
index cc0a70d..f9c6184 100755
--- a/demos/declarative/samegame/SamegameCore/samegame.js
+++ b/demos/declarative/samegame/SamegameCore/samegame.js
@@ -176,14 +176,13 @@ function createBlock(column,row){
     // not be ready immediately. There is a statusChanged signal on the
     // component you could use if you want to wait to load remote files.
     if(component.status == Component.Ready){
-        var dynamicObject = component.createObject();
+        var dynamicObject = component.createObject(gameCanvas);
         if(dynamicObject == null){
             console.log("error creating block");
             console.log(component.errorsString());
             return false;
         }
         dynamicObject.type = Math.floor(Math.random() * 3);
-        dynamicObject.parent = gameCanvas;
         dynamicObject.x = column*gameCanvas.blockSize;
         dynamicObject.targetX = column*gameCanvas.blockSize;
         dynamicObject.targetY = row*gameCanvas.blockSize;
diff --git a/demos/declarative/snake/content/snake.js b/demos/declarative/snake/content/snake.js
index 102bd87..f5c231e 100644
--- a/demos/declarative/snake/content/snake.js
+++ b/demos/declarative/snake/content/snake.js
@@ -59,8 +59,7 @@ function startNewGame()
                     console.log("Still loading linkComponent");
                 continue;//TODO: Better error handling?
             }
-            var link = linkComponent.createObject();
-            link.parent = playfield;
+            var link = linkComponent.createObject(playfield);
             link.z = numRows * numColumns + 1 - i;
             link.type = i == 0 ? 2 : 0;
             link.spawned = false;
@@ -300,8 +299,7 @@ function createCookie(value) {
             console.log("Still loading cookieComponent");
         return;//TODO: Better error handling?
     }
-    cookie = cookieComponent.createObject();
-    cookie.parent = head.parent;
+    cookie = cookieComponent.createObject(head.parent);
     cookie.value = value;
     cookie.row = row;
     cookie.column = column;
diff --git a/doc/src/declarative/dynamicobjects.qdoc b/doc/src/declarative/dynamicobjects.qdoc
index dc0277d..2688ee5 100644
--- a/doc/src/declarative/dynamicobjects.qdoc
+++ b/doc/src/declarative/dynamicobjects.qdoc
@@ -69,7 +69,9 @@ This function takes the URL of the QML file as its only argument and returns
 a component object which can be used to create and load that QML file.
 
 Once you have a component you can use its \l {Component::createObject()}{createObject()} method to create an instance of
-the component. 
+the component. This function takes exactly one argument, which is the parent for the new item. Since graphical items will
+not appear on the scene without a parent, it is recommended that you set the parent this way. However, if you wish to set
+the parent later you can safely pass null to this function.
 
 Here is an example. Here is a \c Sprite.qml, which defines a simple QML component:
 
diff --git a/doc/src/declarative/globalobject.qdoc b/doc/src/declarative/globalobject.qdoc
index 7c27ae4..bc9830a 100644
--- a/doc/src/declarative/globalobject.qdoc
+++ b/doc/src/declarative/globalobject.qdoc
@@ -258,7 +258,10 @@ The methods and properties of the Component element are defined in its own
 page, but when using it dynamically only two methods are usually used.
 \c Component.createObject() returns the created object or \c null if there is an error.
 If there is an error, \l {Component::errorsString()}{Component.errorsString()} describes
-the error that occurred.
+the error that occurred. Note that createObject() takes exactly one argument, which is set
+to the parent of the created object. Graphical objects without a parent will not appear
+on the scene, but if you do not wish to parent the item at this point you can safely pass
+in null.
 
 If you want to just create an arbitrary string of QML, instead of
 loading a QML file, consider the \l{Qt.createQmlObject(string qml, object parent, string filepath)}{Qt.createQmlObject()} function.
diff --git a/doc/src/snippets/declarative/componentCreation.js b/doc/src/snippets/declarative/componentCreation.js
index be928f0..f6fb379 100644
--- a/doc/src/snippets/declarative/componentCreation.js
+++ b/doc/src/snippets/declarative/componentCreation.js
@@ -4,11 +4,10 @@ var sprite;
 
 function finishCreation() {
     if (component.status == Component.Ready) {
-        sprite = component.createObject();
+        sprite = component.createObject(appWindow);
         if (sprite == null) {
             // Error Handling
         } else {
-            sprite.parent = appWindow;
             sprite.x = 100;
             sprite.y = 100;
             // ...
@@ -32,13 +31,12 @@ else
 
 //![2]
 component = Qt.createComponent("Sprite.qml");
-sprite = component.createObject();
+sprite = component.createObject(appWindow);
 
 if (sprite == null) {
     // Error Handling
     console.log("Error loading component:", component.errorsString());
 } else {
-    sprite.parent = appWindow;
     sprite.x = 100;
     sprite.y = 100;
     // ...
@@ -47,5 +45,3 @@ if (sprite == null) {
 
 }
 
-createSpriteObjects();
-
diff --git a/doc/src/snippets/declarative/dynamicObjects.qml b/doc/src/snippets/declarative/dynamicObjects.qml
index dd55d78..6a8c927 100644
--- a/doc/src/snippets/declarative/dynamicObjects.qml
+++ b/doc/src/snippets/declarative/dynamicObjects.qml
@@ -21,8 +21,7 @@ Rectangle {
     }
 
     function createRectangle() {
-        var object = rectComponent.createObject();
-        object.parent = rootItem;
+        var object = rectComponent.createObject(rootItem);
     } 
 
     Component.onCompleted: createRectangle()
diff --git a/examples/declarative/dynamic/qml/itemCreation.js b/examples/declarative/dynamic/qml/itemCreation.js
index 3c1b975..08f5320 100644
--- a/examples/declarative/dynamic/qml/itemCreation.js
+++ b/examples/declarative/dynamic/qml/itemCreation.js
@@ -42,8 +42,7 @@ function loadComponent() {
 
 function createItem() {
     if (itemComponent.status == Component.Ready && draggedItem == null) {
-        draggedItem = itemComponent.createObject();
-        draggedItem.parent = window;
+        draggedItem = itemComponent.createObject(window);
         draggedItem.image = itemButton.image;
         draggedItem.x = xOffset;
         draggedItem.y = yOffset;
diff --git a/examples/declarative/tutorials/samegame/samegame2/samegame.js b/examples/declarative/tutorials/samegame/samegame2/samegame.js
index bcfb5b6..0dbe6a6 100644
--- a/examples/declarative/tutorials/samegame/samegame2/samegame.js
+++ b/examples/declarative/tutorials/samegame/samegame2/samegame.js
@@ -41,13 +41,12 @@ function createBlock(column, row) {
     // Loading and we should wait for the component's statusChanged() signal to
     // know when the file is downloaded and ready before calling createObject().
     if (component.status == Component.Ready) {
-        var dynamicObject = component.createObject();
+        var dynamicObject = component.createObject(background);
         if (dynamicObject == null) {
             console.log("error creating block");
             console.log(component.errorsString());
             return false;
         }
-        dynamicObject.parent = background;
         dynamicObject.x = column * blockSize;
         dynamicObject.y = row * blockSize;
         dynamicObject.width = blockSize;
diff --git a/examples/declarative/tutorials/samegame/samegame3/samegame.js b/examples/declarative/tutorials/samegame/samegame3/samegame.js
index 4256aee..e5ba6e0 100644
--- a/examples/declarative/tutorials/samegame/samegame3/samegame.js
+++ b/examples/declarative/tutorials/samegame/samegame3/samegame.js
@@ -38,14 +38,13 @@ function createBlock(column, row) {
     // Loading and we should wait for the component's statusChanged() signal to
     // know when the file is downloaded and ready before calling createObject().
     if (component.status == Component.Ready) {
-        var dynamicObject = component.createObject();
+        var dynamicObject = component.createObject(gameCanvas);
         if (dynamicObject == null) {
             console.log("error creating block");
             console.log(component.errorsString());
             return false;
         }
         dynamicObject.type = Math.floor(Math.random() * 3);
-        dynamicObject.parent = gameCanvas;
         dynamicObject.x = column * gameCanvas.blockSize;
         dynamicObject.y = row * gameCanvas.blockSize;
         dynamicObject.width = gameCanvas.blockSize;
diff --git a/examples/declarative/tutorials/samegame/samegame4/content/samegame.js b/examples/declarative/tutorials/samegame/samegame4/content/samegame.js
index 961cd66..159c9a7 100755
--- a/examples/declarative/tutorials/samegame/samegame4/content/samegame.js
+++ b/examples/declarative/tutorials/samegame/samegame4/content/samegame.js
@@ -49,14 +49,13 @@ function createBlock(column, row) {
     // Loading and we should wait for the component's statusChanged() signal to
     // know when the file is downloaded and ready before calling createObject().
     if (component.status == Component.Ready) {
-        var dynamicObject = component.createObject();
+        var dynamicObject = component.createObject(gameCanvas);
         if (dynamicObject == null) {
             console.log("error creating block");
             console.log(component.errorsString());
             return false;
         }
         dynamicObject.type = Math.floor(Math.random() * 3);
-        dynamicObject.parent = gameCanvas;
         dynamicObject.x = column * gameCanvas.blockSize;
         dynamicObject.targetX = column * gameCanvas.blockSize;
         dynamicObject.targetY = row * gameCanvas.blockSize;
diff --git a/src/declarative/qml/qdeclarativecomponent.cpp b/src/declarative/qml/qdeclarativecomponent.cpp
index 3ca0707..e7b9c9e 100644
--- a/src/declarative/qml/qdeclarativecomponent.cpp
+++ b/src/declarative/qml/qdeclarativecomponent.cpp
@@ -59,6 +59,7 @@
 #include 
 #include 
 #include 
+#include 
 
 QT_BEGIN_NAMESPACE
 
@@ -557,8 +558,11 @@ QDeclarativeComponent::QDeclarativeComponent(QDeclarativeComponentPrivate &dd, Q
 /*!
     \internal
     A version of create which returns a scriptObject, for use in script
+
+    Sets graphics object parent because forgetting to do this is a frequent
+    and serious problem.
 */
-QScriptValue QDeclarativeComponent::createObject()
+QScriptValue QDeclarativeComponent::createObject(QObject* parent)
 {
     Q_D(QDeclarativeComponent);
     QDeclarativeContext* ctxt = creationContext();
@@ -567,6 +571,20 @@ QScriptValue QDeclarativeComponent::createObject()
     QObject* ret = create(ctxt);
     if (!ret)
         return QScriptValue(QScriptValue::NullValue);
+
+    QGraphicsObject* gobj = qobject_cast(ret);
+    bool needParent = (gobj != 0);
+    if(parent){
+        ret->setParent(parent);
+        QGraphicsObject* gparent = qobject_cast(parent);
+        if(gparent){
+            gobj->setParentItem(gparent);
+            needParent = false;
+        }
+    }
+    if(needParent)
+        qWarning("QDeclarativeComponent: Created graphical object was not placed in the graphics scene.");
+
     QDeclarativeEnginePrivate *priv = QDeclarativeEnginePrivate::get(d->engine);
     QDeclarativeData::get(ret, true)->setImplicitDestructible();
     return priv->objectClass->newQObject(ret, QMetaType::QObjectStar);
diff --git a/src/declarative/qml/qdeclarativecomponent.h b/src/declarative/qml/qdeclarativecomponent.h
index b078174..688e233 100644
--- a/src/declarative/qml/qdeclarativecomponent.h
+++ b/src/declarative/qml/qdeclarativecomponent.h
@@ -109,7 +109,7 @@ Q_SIGNALS:
 
 protected:
     QDeclarativeComponent(QDeclarativeComponentPrivate &dd, QObject* parent);
-    Q_INVOKABLE QScriptValue createObject();
+    Q_INVOKABLE QScriptValue createObject(QObject* parent);
 
 private:
     QDeclarativeComponent(QDeclarativeEngine *, QDeclarativeCompiledData *, int, int, QObject *parent);
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/dynamicCreation.qml b/tests/auto/declarative/qdeclarativeecmascript/data/dynamicCreation.qml
index 3047e9b..7b132e1 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/dynamicCreation.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/dynamicCreation.qml
@@ -11,7 +11,7 @@ MyQmlObject{
     function createTwo()
     {
         var component = Qt.createComponent('dynamicCreation.helper.qml');
-        obj.objectProperty = component.createObject();
+        obj.objectProperty = component.createObject(obj);
     }
 
     function createThree()
@@ -22,6 +22,6 @@ MyQmlObject{
     function dontCrash()
     {
         var component = Qt.createComponent('file-doesnt-exist.qml');
-        obj.objectProperty = component.createObject();
+        obj.objectProperty = component.createObject(obj);
     }
 }
-- 
cgit v0.12


From 053fcebb7ef1b3899b656d511437a8139ee012b7 Mon Sep 17 00:00:00 2001
From: Martin Jones 
Date: Thu, 6 May 2010 08:45:13 +1000
Subject: Initialize variable and crash less.

---
 tools/qml/qmlruntime.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/qml/qmlruntime.cpp b/tools/qml/qmlruntime.cpp
index 1229df2..fe0f67c 100644
--- a/tools/qml/qmlruntime.cpp
+++ b/tools/qml/qmlruntime.cpp
@@ -469,6 +469,7 @@ QDeclarativeViewer::QDeclarativeViewer(QWidget *parent, Qt::WindowFlags flags)
       , m_scriptOptions(0)
       , tester(0)
       , useQmlFileBrowser(true)
+      , translator(0)
 {
     QDeclarativeViewer::registerTypes();
     setWindowTitle(tr("Qt Qml Runtime"));
-- 
cgit v0.12


From 2df493e9f0660be7d9b5ba691883e13fa12cde72 Mon Sep 17 00:00:00 2001
From: Michael Brasser 
Date: Thu, 6 May 2010 09:18:36 +1000
Subject: Fix compile in namespace.

---
 tools/qml/loggerwidget.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/qml/loggerwidget.h b/tools/qml/loggerwidget.h
index b68ecc5..fd20c41 100644
--- a/tools/qml/loggerwidget.h
+++ b/tools/qml/loggerwidget.h
@@ -86,8 +86,8 @@ private:
     Visibility m_visibility;
 };
 
-Q_DECLARE_METATYPE(LoggerWidget::Visibility);
-
 QT_END_NAMESPACE
 
+Q_DECLARE_METATYPE(LoggerWidget::Visibility)
+
 #endif // LOGGERWIDGET_H
-- 
cgit v0.12


From 8e023477777982d3aeb53d26ed61f7e8c1eb753c Mon Sep 17 00:00:00 2001
From: Warwick Allison 
Date: Thu, 6 May 2010 09:34:51 +1000
Subject: Another initialization fix. Unleak.

---
 tools/qml/main.cpp       | 2 +-
 tools/qml/qmlruntime.cpp | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp
index 78f0c87..fb687ac 100644
--- a/tools/qml/main.cpp
+++ b/tools/qml/main.cpp
@@ -54,7 +54,7 @@
 
 QT_USE_NAMESPACE
 
-QtMsgHandler systemMsgOutput;
+QtMsgHandler systemMsgOutput = 0;
 
 #if defined (Q_OS_SYMBIAN)
 #include 
diff --git a/tools/qml/qmlruntime.cpp b/tools/qml/qmlruntime.cpp
index fe0f67c..d49b0f1 100644
--- a/tools/qml/qmlruntime.cpp
+++ b/tools/qml/qmlruntime.cpp
@@ -543,6 +543,7 @@ QDeclarativeViewer::QDeclarativeViewer(QWidget *parent, Qt::WindowFlags flags)
 
 QDeclarativeViewer::~QDeclarativeViewer()
 {
+    delete loggerWindow;
     canvas->engine()->setNetworkAccessManagerFactory(0);
     delete namFactory;
 }
-- 
cgit v0.12


From 2df39e548264617b8e10fae32bdafbfe2edcd895 Mon Sep 17 00:00:00 2001
From: Martin Jones 
Date: Thu, 6 May 2010 09:39:31 +1000
Subject: Fix some compiler warnings.

---
 src/declarative/qml/qdeclarativeengine.cpp | 46 +++++++++++++++---------------
 src/declarative/qml/qdeclarativeinfo.cpp   |  3 +-
 2 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp
index 6ddd01e..cc6c5fe 100644
--- a/src/declarative/qml/qdeclarativeengine.cpp
+++ b/src/declarative/qml/qdeclarativeengine.cpp
@@ -962,7 +962,7 @@ QScriptValue QDeclarativeEnginePrivate::createComponent(QScriptContext *ctxt, QS
     Q_ASSERT(context);
 
     if(ctxt->argumentCount() != 1) {
-        return ctxt->throwError("Qt.createComponent(): Invalid arguments");
+        return ctxt->throwError(QLatin1String("Qt.createComponent(): Invalid arguments"));
     }else{
         QString arg = ctxt->argument(0).toString();
         if (arg.isEmpty())
@@ -982,7 +982,7 @@ QScriptValue QDeclarativeEnginePrivate::createQmlObject(QScriptContext *ctxt, QS
     QDeclarativeEngine* activeEngine = activeEnginePriv->q_func();
 
     if(ctxt->argumentCount() < 2 || ctxt->argumentCount() > 3)
-        return ctxt->throwError("Qt.createQmlObject(): Invalid arguments");
+        return ctxt->throwError(QLatin1String("Qt.createQmlObject(): Invalid arguments"));
 
     QDeclarativeContextData* context = activeEnginePriv->getContext(ctxt);
     Q_ASSERT(context);
@@ -1002,7 +1002,7 @@ QScriptValue QDeclarativeEnginePrivate::createQmlObject(QScriptContext *ctxt, QS
 
     QObject *parentArg = activeEnginePriv->objectClass->toQObject(ctxt->argument(1));
     if(!parentArg)
-        return ctxt->throwError("Qt.createQmlObject(): Missing parent object");
+        return ctxt->throwError(QLatin1String("Qt.createQmlObject(): Missing parent object"));
 
     QDeclarativeComponent component(activeEngine);
     component.setData(qml.toUtf8(), url);
@@ -1027,7 +1027,7 @@ QScriptValue QDeclarativeEnginePrivate::createQmlObject(QScriptContext *ctxt, QS
     }
 
     if (!component.isReady())
-        return ctxt->throwError("Qt.createQmlObject(): Component is not ready");
+        return ctxt->throwError(QLatin1String("Qt.createQmlObject(): Component is not ready"));
 
     QObject *obj = component.beginCreate(context->asQDeclarativeContext());
     if(obj)
@@ -1076,7 +1076,7 @@ QScriptValue QDeclarativeEnginePrivate::isQtObject(QScriptContext *ctxt, QScript
 QScriptValue QDeclarativeEnginePrivate::vector(QScriptContext *ctxt, QScriptEngine *engine)
 {
     if(ctxt->argumentCount() != 3)
-        return ctxt->throwError("Qt.vector(): Invalid arguments");
+        return ctxt->throwError(QLatin1String("Qt.vector(): Invalid arguments"));
     qsreal x = ctxt->argument(0).toNumber();
     qsreal y = ctxt->argument(1).toNumber();
     qsreal z = ctxt->argument(2).toNumber();
@@ -1087,7 +1087,7 @@ QScriptValue QDeclarativeEnginePrivate::formatDate(QScriptContext*ctxt, QScriptE
 {
     int argCount = ctxt->argumentCount();
     if(argCount == 0 || argCount > 2)
-        return ctxt->throwError("Qt.formatDate(): Invalid arguments");
+        return ctxt->throwError(QLatin1String("Qt.formatDate(): Invalid arguments"));
 
     QDate date = ctxt->argument(0).toDateTime().date();
     Qt::DateFormat enumFormat = Qt::DefaultLocaleShortDate;
@@ -1098,7 +1098,7 @@ QScriptValue QDeclarativeEnginePrivate::formatDate(QScriptContext*ctxt, QScriptE
         } else if (ctxt->argument(1).isNumber()) {
             enumFormat = Qt::DateFormat(ctxt->argument(1).toUInt32());
         } else {
-            return ctxt->throwError("Qt.formatDate(): Invalid date format");
+            return ctxt->throwError(QLatin1String("Qt.formatDate(): Invalid date format"));
         }
     }
     return engine->newVariant(qVariantFromValue(date.toString(enumFormat)));
@@ -1108,7 +1108,7 @@ QScriptValue QDeclarativeEnginePrivate::formatTime(QScriptContext*ctxt, QScriptE
 {
     int argCount = ctxt->argumentCount();
     if(argCount == 0 || argCount > 2)
-        return ctxt->throwError("Qt.formatTime(): Invalid arguments");
+        return ctxt->throwError(QLatin1String("Qt.formatTime(): Invalid arguments"));
 
     QTime date = ctxt->argument(0).toDateTime().time();
     Qt::DateFormat enumFormat = Qt::DefaultLocaleShortDate;
@@ -1119,7 +1119,7 @@ QScriptValue QDeclarativeEnginePrivate::formatTime(QScriptContext*ctxt, QScriptE
         } else if (ctxt->argument(1).isNumber()) {
             enumFormat = Qt::DateFormat(ctxt->argument(1).toUInt32());
         } else {
-            return ctxt->throwError("Qt.formatTime(): Invalid time format");
+            return ctxt->throwError(QLatin1String("Qt.formatTime(): Invalid time format"));
         }
     }
     return engine->newVariant(qVariantFromValue(date.toString(enumFormat)));
@@ -1129,7 +1129,7 @@ QScriptValue QDeclarativeEnginePrivate::formatDateTime(QScriptContext*ctxt, QScr
 {
     int argCount = ctxt->argumentCount();
     if(argCount == 0 || argCount > 2)
-        return ctxt->throwError("Qt.formatDateTime(): Invalid arguments");
+        return ctxt->throwError(QLatin1String("Qt.formatDateTime(): Invalid arguments"));
 
     QDateTime date = ctxt->argument(0).toDateTime();
     Qt::DateFormat enumFormat = Qt::DefaultLocaleShortDate;
@@ -1140,7 +1140,7 @@ QScriptValue QDeclarativeEnginePrivate::formatDateTime(QScriptContext*ctxt, QScr
         } else if (ctxt->argument(1).isNumber()) {
             enumFormat = Qt::DateFormat(ctxt->argument(1).toUInt32());
         } else { 
-            return ctxt->throwError("Qt.formatDateTime(): Invalid datetime format");
+            return ctxt->throwError(QLatin1String("Qt.formatDateTime(): Invalid datetime format"));
         }
     }
     return engine->newVariant(qVariantFromValue(date.toString(enumFormat)));
@@ -1150,7 +1150,7 @@ QScriptValue QDeclarativeEnginePrivate::rgba(QScriptContext *ctxt, QScriptEngine
 {
     int argCount = ctxt->argumentCount();
     if(argCount < 3 || argCount > 4)
-        return ctxt->throwError("Qt.rgba(): Invalid arguments");
+        return ctxt->throwError(QLatin1String("Qt.rgba(): Invalid arguments"));
     qsreal r = ctxt->argument(0).toNumber();
     qsreal g = ctxt->argument(1).toNumber();
     qsreal b = ctxt->argument(2).toNumber();
@@ -1172,7 +1172,7 @@ QScriptValue QDeclarativeEnginePrivate::hsla(QScriptContext *ctxt, QScriptEngine
 {
     int argCount = ctxt->argumentCount();
     if(argCount < 3 || argCount > 4)
-        return ctxt->throwError("Qt.hsla(): Invalid arguments");
+        return ctxt->throwError(QLatin1String("Qt.hsla(): Invalid arguments"));
     qsreal h = ctxt->argument(0).toNumber();
     qsreal s = ctxt->argument(1).toNumber();
     qsreal l = ctxt->argument(2).toNumber();
@@ -1193,7 +1193,7 @@ QScriptValue QDeclarativeEnginePrivate::hsla(QScriptContext *ctxt, QScriptEngine
 QScriptValue QDeclarativeEnginePrivate::rect(QScriptContext *ctxt, QScriptEngine *engine)
 {
     if(ctxt->argumentCount() != 4)
-        return ctxt->throwError("Qt.rect(): Invalid arguments");
+        return ctxt->throwError(QLatin1String("Qt.rect(): Invalid arguments"));
 
     qsreal x = ctxt->argument(0).toNumber();
     qsreal y = ctxt->argument(1).toNumber();
@@ -1209,7 +1209,7 @@ QScriptValue QDeclarativeEnginePrivate::rect(QScriptContext *ctxt, QScriptEngine
 QScriptValue QDeclarativeEnginePrivate::point(QScriptContext *ctxt, QScriptEngine *engine)
 {
     if(ctxt->argumentCount() != 2)
-        return ctxt->throwError("Qt.point(): Invalid arguments");
+        return ctxt->throwError(QLatin1String("Qt.point(): Invalid arguments"));
     qsreal x = ctxt->argument(0).toNumber();
     qsreal y = ctxt->argument(1).toNumber();
     return QDeclarativeEnginePrivate::get(engine)->scriptValueFromVariant(qVariantFromValue(QPointF(x, y)));
@@ -1218,7 +1218,7 @@ QScriptValue QDeclarativeEnginePrivate::point(QScriptContext *ctxt, QScriptEngin
 QScriptValue QDeclarativeEnginePrivate::size(QScriptContext *ctxt, QScriptEngine *engine)
 {
     if(ctxt->argumentCount() != 2)
-        return ctxt->throwError("Qt.size(): Invalid arguments");
+        return ctxt->throwError(QLatin1String("Qt.size(): Invalid arguments"));
     qsreal w = ctxt->argument(0).toNumber();
     qsreal h = ctxt->argument(1).toNumber();
     return QDeclarativeEnginePrivate::get(engine)->scriptValueFromVariant(qVariantFromValue(QSizeF(w, h)));
@@ -1227,7 +1227,7 @@ QScriptValue QDeclarativeEnginePrivate::size(QScriptContext *ctxt, QScriptEngine
 QScriptValue QDeclarativeEnginePrivate::lighter(QScriptContext *ctxt, QScriptEngine *engine)
 {
     if(ctxt->argumentCount() != 1 && ctxt->argumentCount() != 2)
-        return ctxt->throwError("Qt.lighter(): Invalid arguments");
+        return ctxt->throwError(QLatin1String("Qt.lighter(): Invalid arguments"));
     QVariant v = ctxt->argument(0).toVariant();
     QColor color;
     if (v.userType() == QVariant::Color)
@@ -1249,7 +1249,7 @@ QScriptValue QDeclarativeEnginePrivate::lighter(QScriptContext *ctxt, QScriptEng
 QScriptValue QDeclarativeEnginePrivate::darker(QScriptContext *ctxt, QScriptEngine *engine)
 {
     if(ctxt->argumentCount() != 1 && ctxt->argumentCount() != 2)
-        return ctxt->throwError("Qt.darker(): Invalid arguments");
+        return ctxt->throwError(QLatin1String("Qt.darker(): Invalid arguments"));
     QVariant v = ctxt->argument(0).toVariant();
     QColor color;
     if (v.userType() == QVariant::Color)
@@ -1282,7 +1282,7 @@ QScriptValue QDeclarativeEnginePrivate::desktopOpenUrl(QScriptContext *ctxt, QSc
 QScriptValue QDeclarativeEnginePrivate::fontFamilies(QScriptContext *ctxt, QScriptEngine *e)
 {
     if(ctxt->argumentCount() != 0)
-        return ctxt->throwError("Qt.fontFamilies(): Invalid arguments");
+        return ctxt->throwError(QLatin1String("Qt.fontFamilies(): Invalid arguments"));
 
     QDeclarativeEnginePrivate *p = QDeclarativeEnginePrivate::get(e);
     QFontDatabase database;
@@ -1292,7 +1292,7 @@ QScriptValue QDeclarativeEnginePrivate::fontFamilies(QScriptContext *ctxt, QScri
 QScriptValue QDeclarativeEnginePrivate::md5(QScriptContext *ctxt, QScriptEngine *)
 {
     if (ctxt->argumentCount() != 1)
-        return ctxt->throwError("Qt.md5(): Invalid arguments");
+        return ctxt->throwError(QLatin1String("Qt.md5(): Invalid arguments"));
 
     QByteArray data = ctxt->argument(0).toString().toUtf8();
     QByteArray result = QCryptographicHash::hash(data, QCryptographicHash::Md5);
@@ -1303,7 +1303,7 @@ QScriptValue QDeclarativeEnginePrivate::md5(QScriptContext *ctxt, QScriptEngine
 QScriptValue QDeclarativeEnginePrivate::btoa(QScriptContext *ctxt, QScriptEngine *)
 {
     if (ctxt->argumentCount() != 1) 
-        return ctxt->throwError("Qt.btoa(): Invalid arguments");
+        return ctxt->throwError(QLatin1String("Qt.btoa(): Invalid arguments"));
 
     QByteArray data = ctxt->argument(0).toString().toUtf8();
 
@@ -1313,7 +1313,7 @@ QScriptValue QDeclarativeEnginePrivate::btoa(QScriptContext *ctxt, QScriptEngine
 QScriptValue QDeclarativeEnginePrivate::atob(QScriptContext *ctxt, QScriptEngine *)
 {
     if (ctxt->argumentCount() != 1) 
-        return ctxt->throwError("Qt.atob(): Invalid arguments");
+        return ctxt->throwError(QLatin1String("Qt.atob(): Invalid arguments"));
 
     QByteArray data = ctxt->argument(0).toString().toUtf8();
 
@@ -1414,7 +1414,7 @@ QScriptValue QDeclarativeEnginePrivate::quit(QScriptContext * /*ctxt*/, QScriptE
 QScriptValue QDeclarativeEnginePrivate::tint(QScriptContext *ctxt, QScriptEngine *engine)
 {
     if(ctxt->argumentCount() != 2)
-        return ctxt->throwError("Qt.tint(): Invalid arguments");
+        return ctxt->throwError(QLatin1String("Qt.tint(): Invalid arguments"));
     //get color
     QVariant v = ctxt->argument(0).toVariant();
     QColor color;
diff --git a/src/declarative/qml/qdeclarativeinfo.cpp b/src/declarative/qml/qdeclarativeinfo.cpp
index ffed14e..c980a2a 100644
--- a/src/declarative/qml/qdeclarativeinfo.cpp
+++ b/src/declarative/qml/qdeclarativeinfo.cpp
@@ -78,8 +78,9 @@ QT_BEGIN_NAMESPACE
     \endcode
 */
 
-struct QDeclarativeInfoPrivate
+class QDeclarativeInfoPrivate
 {
+public:
     QDeclarativeInfoPrivate() : ref (1), object(0) {}
 
     int ref;
-- 
cgit v0.12


From ac0b3eec9fbf25fb72d5368fa7ba31b58bb7ed30 Mon Sep 17 00:00:00 2001
From: Martin Jones 
Date: Thu, 6 May 2010 09:46:49 +1000
Subject: Doc: more clarification of cacheBuffer

---
 src/declarative/graphicsitems/qdeclarativegridview.cpp | 3 +++
 src/declarative/graphicsitems/qdeclarativelistview.cpp | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/src/declarative/graphicsitems/qdeclarativegridview.cpp b/src/declarative/graphicsitems/qdeclarativegridview.cpp
index ef6d3df..869826c 100644
--- a/src/declarative/graphicsitems/qdeclarativegridview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativegridview.cpp
@@ -1415,6 +1415,9 @@ void QDeclarativeGridView::setWrapEnabled(bool wrap)
     set to 40, then up to 2 delegates above and 2 delegates below the visible
     area may be retained.
 
+    Note that cacheBuffer is not a pixel buffer - it only maintains additional
+    instantiated delegates.
+
     Setting this value can make scrolling the list smoother at the expense
     of additional memory usage.  It is not a substitute for creating efficient
     delegates; the fewer elements in a delegate, the faster a view may be
diff --git a/src/declarative/graphicsitems/qdeclarativelistview.cpp b/src/declarative/graphicsitems/qdeclarativelistview.cpp
index 8485071..0811278 100644
--- a/src/declarative/graphicsitems/qdeclarativelistview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativelistview.cpp
@@ -1848,6 +1848,9 @@ void QDeclarativeListView::setWrapEnabled(bool wrap)
     set to 40, then up to 2 delegates above and 2 delegates below the visible
     area may be retained.
 
+    Note that cacheBuffer is not a pixel buffer - it only maintains additional
+    instantiated delegates.
+
     Setting this value can make scrolling the list smoother at the expense
     of additional memory usage.  It is not a substitute for creating efficient
     delegates; the fewer elements in a delegate, the faster a view may be
-- 
cgit v0.12


From c13db7e74887b648960161b5f4fa04ed8dfd3e64 Mon Sep 17 00:00:00 2001
From: Yann Bodson 
Date: Thu, 6 May 2010 10:16:25 +1000
Subject: doc fixes

---
 doc/src/declarative/animation.qdoc | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/doc/src/declarative/animation.qdoc b/doc/src/declarative/animation.qdoc
index 88aca1b..6e98949 100644
--- a/doc/src/declarative/animation.qdoc
+++ b/doc/src/declarative/animation.qdoc
@@ -73,9 +73,9 @@ Rectangle {
         y: 0
         SequentialAnimation on y {
             loops: Animation.Infinite
-            NumberAnimation { to: 200-img.height; easing.type: "OutBounce"; duration: 2000 }
+            NumberAnimation { to: 200-img.height; easing.type: Easing.OutBounce; duration: 2000 }
             PauseAnimation { duration: 1000 }
-            NumberAnimation { to: 0; easing.type: "OutQuad"; duration: 1000 }
+            NumberAnimation { to: 0; easing.type: Easing.OutQuad; duration: 1000 }
         }
     }
 }
@@ -136,7 +136,7 @@ transitions: [
     Transition {
         NumberAnimation {
             properties: "x,y"
-            easing.type: "OutBounce"
+            easing.type: Easing.OutBounce
             duration: 200
         }
     }
@@ -157,7 +157,7 @@ Transition {
     SequentialAnimation {
         NumberAnimation {
             duration: 1000
-            easing.type: "OutBounce"
+            easing.type: Easing.OutBounce
             // animate myItem's x and y if they have changed in the state
             target: myItem
             properties: "x,y"
@@ -199,7 +199,7 @@ Transition {
         ParallelAnimation {
             NumberAnimation {
                 duration: 1000
-                easing.type: "OutBounce"
+                easing.type: Easing.OutBounce
                 targets: box1
                 properties: "x,y"
             }
@@ -227,7 +227,7 @@ Rectangle {
     id: redRect
     color: "red"
     width: 100; height: 100
-    Behavior on x { NumberAnimation { duration: 300; easing.type: "InOutQuad" } }
+    Behavior on x { NumberAnimation { duration: 300; easing.type: Easing.InOutQuad } }
 }
 \endqml
 
-- 
cgit v0.12


From d6da01355fb436a04932131373579938dc4b7d8d Mon Sep 17 00:00:00 2001
From: Aaron Kennedy 
Date: Thu, 6 May 2010 10:49:57 +1000
Subject: Compile

---
 tests/auto/declarative/declarative.pro | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/auto/declarative/declarative.pro b/tests/auto/declarative/declarative.pro
index 9b3b3d0..b8e33cf 100644
--- a/tests/auto/declarative/declarative.pro
+++ b/tests/auto/declarative/declarative.pro
@@ -29,7 +29,6 @@ SUBDIRS += \
            qdeclarativeitem \        # Cover
            qdeclarativelistview \    # Cover
            qdeclarativeloader \      # Cover
-           qdeclarativelayouts \     # Cover
            qdeclarativemousearea \   # Cover
            qdeclarativeparticles \   # Cover
            qdeclarativepathview \    # Cover
-- 
cgit v0.12


From c628213c5b64b50e914d173d207f4fe64629d5e2 Mon Sep 17 00:00:00 2001
From: Aaron Kennedy 
Date: Thu, 6 May 2010 10:50:04 +1000
Subject: Add QML_XHR_DUMP option

---
 src/declarative/qml/qdeclarativexmlhttprequest.cpp | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/src/declarative/qml/qdeclarativexmlhttprequest.cpp b/src/declarative/qml/qdeclarativexmlhttprequest.cpp
index b7e1832..94205fe 100644
--- a/src/declarative/qml/qdeclarativexmlhttprequest.cpp
+++ b/src/declarative/qml/qdeclarativexmlhttprequest.cpp
@@ -46,6 +46,7 @@
 #include "private/qdeclarativerefcount_p.h"
 #include "private/qdeclarativeengine_p.h"
 #include "private/qdeclarativeexpression_p.h"
+#include "qdeclarativeglobal_p.h"
 
 #include 
 #include 
@@ -94,6 +95,8 @@
 
 QT_BEGIN_NAMESPACE
 
+DEFINE_BOOL_CONFIG_OPTION(xhrDump, QML_XHR_DUMP);
+
 class DocumentImpl;
 class NodeImpl 
 {
@@ -1131,6 +1134,14 @@ void QDeclarativeXMLHttpRequest::requestFromUrl(const QUrl &url)
         }
     }
 
+    if (xhrDump()) {
+        qWarning().nospace() << "XMLHttpRequest: " << qPrintable(m_method) << " " << qPrintable(url.toString());
+        if (!m_data.isEmpty()) {
+            qWarning().nospace() << "                " 
+                                 << qPrintable(QString::fromUtf8(m_data));
+        }
+    }
+
     if (m_method == QLatin1String("GET"))
         m_network = networkAccessManager()->get(request);
     else if (m_method == QLatin1String("HEAD"))
@@ -1264,6 +1275,16 @@ void QDeclarativeXMLHttpRequest::finished()
         if (cbv.isError()) printError(cbv);
     }
     m_responseEntityBody.append(m_network->readAll());
+
+    if (xhrDump()) {
+        qWarning().nospace() << "XMLHttpRequest: RESPONSE " << qPrintable(m_url.toString());
+        if (!m_responseEntityBody.isEmpty()) {
+            qWarning().nospace() << "                " 
+                                 << qPrintable(QString::fromUtf8(m_responseEntityBody));
+        }
+    }
+
+
     m_data.clear();
     destroyNetwork();
     if (m_state < Loading) {
-- 
cgit v0.12


From 1eb430a1f1ddb3d88ec44294606b365e119b2e01 Mon Sep 17 00:00:00 2001
From: Aaron Kennedy 
Date: Thu, 6 May 2010 10:55:13 +1000
Subject: Fix autotest

---
 tests/auto/declarative/examples/tst_examples.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/auto/declarative/examples/tst_examples.cpp b/tests/auto/declarative/examples/tst_examples.cpp
index 058fda1..4f10a98 100644
--- a/tests/auto/declarative/examples/tst_examples.cpp
+++ b/tests/auto/declarative/examples/tst_examples.cpp
@@ -87,6 +87,7 @@ tst_examples::tst_examples()
     excludedDirs << "examples/declarative/gestures";
 
     excludedDirs << "examples/declarative/imageprovider";
+    excludedDirs << "examples/declarative/layouts/graphicsLayouts";
     excludedDirs << "demos/declarative/minehunt";
 
     excludedDirs << "doc/src/snippets/declarative/graphicswidgets";
-- 
cgit v0.12


From 4b0c60c6246fb7aacea3d74787a9e5a0cc507edd Mon Sep 17 00:00:00 2001
From: Martin Jones 
Date: Thu, 6 May 2010 11:00:51 +1000
Subject: Add missing test file.

---
 .../qdeclarativevisualdatamodel/data/objectlist.qml      | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 tests/auto/declarative/qdeclarativevisualdatamodel/data/objectlist.qml

diff --git a/tests/auto/declarative/qdeclarativevisualdatamodel/data/objectlist.qml b/tests/auto/declarative/qdeclarativevisualdatamodel/data/objectlist.qml
new file mode 100644
index 0000000..f5198c9
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativevisualdatamodel/data/objectlist.qml
@@ -0,0 +1,16 @@
+import Qt 4.7
+
+ListView {
+    width: 100
+    height: 100
+    anchors.fill: parent
+    model: myModel
+    delegate: Component {
+        Rectangle {
+            height: 25
+            width: 100
+            color: model.modelData.color
+            Text { objectName: "name"; text: name }
+        }
+    }
+}
-- 
cgit v0.12


From c16cc8c4d03cb062c5164295cad75509ec31feaf Mon Sep 17 00:00:00 2001
From: Yann Bodson 
Date: Thu, 6 May 2010 11:16:45 +1000
Subject: Use enum for drag.axis in doc and examples.

---
 demos/declarative/flickr/common/Slider.qml              | 2 +-
 doc/src/snippets/declarative/drag.qml                   | 2 +-
 examples/declarative/dial/dial-example.qml              | 2 +-
 examples/declarative/mousearea/mouse.qml                | 2 +-
 examples/declarative/slideswitch/content/Switch.qml     | 2 +-
 examples/declarative/velocity/Day.qml                   | 2 +-
 src/declarative/graphicsitems/qdeclarativemousearea.cpp | 4 ++--
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/demos/declarative/flickr/common/Slider.qml b/demos/declarative/flickr/common/Slider.qml
index 4da370e..76f6303 100644
--- a/demos/declarative/flickr/common/Slider.qml
+++ b/demos/declarative/flickr/common/Slider.qml
@@ -29,7 +29,7 @@ Item {
 
         MouseArea {
             anchors.fill: parent; drag.target: parent
-            drag.axis: "XAxis"; drag.minimumX: 2; drag.maximumX: slider.xMax+2
+            drag.axis: Drag.XAxis; drag.minimumX: 2; drag.maximumX: slider.xMax+2
             onPositionChanged: { value = (maximum - minimum) * (handle.x-2) / slider.xMax + minimum; }
         }
     }
diff --git a/doc/src/snippets/declarative/drag.qml b/doc/src/snippets/declarative/drag.qml
index 9465efb..79469e3 100644
--- a/doc/src/snippets/declarative/drag.qml
+++ b/doc/src/snippets/declarative/drag.qml
@@ -9,7 +9,7 @@ Rectangle {
         MouseArea {
             anchors.fill: parent
             drag.target: pic
-            drag.axis: "XAxis"
+            drag.axis: Drag.XAxis
             drag.minimumX: 0
             drag.maximumX: blurtest.width-pic.width
         }
diff --git a/examples/declarative/dial/dial-example.qml b/examples/declarative/dial/dial-example.qml
index fd899a5..2e102b0 100644
--- a/examples/declarative/dial/dial-example.qml
+++ b/examples/declarative/dial/dial-example.qml
@@ -37,7 +37,7 @@ Rectangle {
 
             MouseArea {
                 anchors.fill: parent
-                drag.target: parent; drag.axis: "XAxis"; drag.minimumX: 2; drag.maximumX: container.width - 32
+                drag.target: parent; drag.axis: Drag.XAxis; drag.minimumX: 2; drag.maximumX: container.width - 32
             }
         }
     }
diff --git a/examples/declarative/mousearea/mouse.qml b/examples/declarative/mousearea/mouse.qml
index 67302a8..06134b7 100644
--- a/examples/declarative/mousearea/mouse.qml
+++ b/examples/declarative/mousearea/mouse.qml
@@ -33,7 +33,7 @@ Rectangle {
         MouseArea {
             anchors.fill: parent
             drag.target: parent
-            drag.axis: "XAxis"
+            drag.axis: Drag.XAxis
             drag.minimumX: 0
             drag.maximumX: 150
 
diff --git a/examples/declarative/slideswitch/content/Switch.qml b/examples/declarative/slideswitch/content/Switch.qml
index 1aa7696..526a171 100644
--- a/examples/declarative/slideswitch/content/Switch.qml
+++ b/examples/declarative/slideswitch/content/Switch.qml
@@ -45,7 +45,7 @@ Item {
 
         MouseArea {
             anchors.fill: parent
-            drag.target: knob; drag.axis: "XAxis"; drag.minimumX: 1; drag.maximumX: 78
+            drag.target: knob; drag.axis: Drag.XAxis; drag.minimumX: 1; drag.maximumX: 78
             onClicked: toggle()
             onReleased: dorelease()
         }
diff --git a/examples/declarative/velocity/Day.qml b/examples/declarative/velocity/Day.qml
index 433295b..350c1c4 100644
--- a/examples/declarative/velocity/Day.qml
+++ b/examples/declarative/velocity/Day.qml
@@ -61,7 +61,7 @@ Component {
                             id: mouse
                             anchors.fill: parent
                             drag.target: stickyPage
-                            drag.axis: "XandYAxis"
+                            drag.axis: Drag.XandYAxis
                             drag.minimumY: 0
                             drag.maximumY: page.height - 80
                             drag.minimumX: 100
diff --git a/src/declarative/graphicsitems/qdeclarativemousearea.cpp b/src/declarative/graphicsitems/qdeclarativemousearea.cpp
index d178107..c5a995e 100644
--- a/src/declarative/graphicsitems/qdeclarativemousearea.cpp
+++ b/src/declarative/graphicsitems/qdeclarativemousearea.cpp
@@ -746,7 +746,7 @@ QDeclarativeDrag *QDeclarativeMouseArea::drag()
 /*!
     \qmlproperty Item MouseArea::drag.target
     \qmlproperty bool MouseArea::drag.active
-    \qmlproperty Axis MouseArea::drag.axis
+    \qmlproperty enumeration MouseArea::drag.axis
     \qmlproperty real MouseArea::drag.minimumX
     \qmlproperty real MouseArea::drag.maximumX
     \qmlproperty real MouseArea::drag.minimumY
@@ -757,7 +757,7 @@ QDeclarativeDrag *QDeclarativeMouseArea::drag()
     \list
     \i \c target specifies the item to drag.
     \i \c active specifies if the target item is being currently dragged.
-    \i \c axis specifies whether dragging can be done horizontally (XAxis), vertically (YAxis), or both (XandYAxis)
+    \i \c axis specifies whether dragging can be done horizontally (Drag.XAxis), vertically (Drag.YAxis), or both (Drag.XandYAxis)
     \i the minimum and maximum properties limit how far the target can be dragged along the corresponding axes.
     \endlist
 
-- 
cgit v0.12


From 3e4116ff5337d41466904b2e381dfa74267264a8 Mon Sep 17 00:00:00 2001
From: Yann Bodson 
Date: Thu, 6 May 2010 12:42:36 +1000
Subject: Cleanup

---
 examples/declarative/animations/color-animation.qml      |  5 ++---
 examples/declarative/animations/property-animation.qml   |  1 -
 examples/declarative/connections/connections-example.qml |  1 -
 examples/declarative/dynamic/qml/PerspectiveItem.qml     |  3 +--
 examples/declarative/listview/dynamic.qml                | 16 +++++++---------
 examples/declarative/parallax/qml/ParallaxView.qml       | 15 +++++++--------
 examples/declarative/parallax/qml/Smiley.qml             |  3 +--
 7 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/examples/declarative/animations/color-animation.qml b/examples/declarative/animations/color-animation.qml
index 3616a31..61737e9 100644
--- a/examples/declarative/animations/color-animation.qml
+++ b/examples/declarative/animations/color-animation.qml
@@ -31,15 +31,14 @@ Item {
     // the sun, moon, and stars
     Item {
         width: parent.width; height: 2 * parent.height
-        transformOrigin: Item.Center
         NumberAnimation on rotation { from: 0; to: 360; duration: 10000; loops: Animation.Infinite }
         Image {
             source: "images/sun.png"; y: 10; anchors.horizontalCenter: parent.horizontalCenter
-            transformOrigin: Item.Center; rotation: -3 * parent.rotation
+            rotation: -3 * parent.rotation
         }
         Image {
             source: "images/moon.png"; y: parent.height - 74; anchors.horizontalCenter: parent.horizontalCenter
-            transformOrigin: Item.Center; rotation: -parent.rotation
+            rotation: -parent.rotation
         }
         Particles {
             x: 0; y: parent.height/2; width: parent.width; height: parent.height/2
diff --git a/examples/declarative/animations/property-animation.qml b/examples/declarative/animations/property-animation.qml
index 6360511..87ac8ec 100644
--- a/examples/declarative/animations/property-animation.qml
+++ b/examples/declarative/animations/property-animation.qml
@@ -26,7 +26,6 @@ Item {
     Image {
         anchors.horizontalCenter: parent.horizontalCenter
         source: "images/shadow.png"; y: smiley.minHeight + 58
-        transformOrigin: Item.Center
 
         // The scale property depends on the y position of the smiley face.
         scale: smiley.y * 0.5 / (smiley.minHeight - smiley.maxHeight)
diff --git a/examples/declarative/connections/connections-example.qml b/examples/declarative/connections/connections-example.qml
index 1dd10ab..e65a280 100644
--- a/examples/declarative/connections/connections-example.qml
+++ b/examples/declarative/connections/connections-example.qml
@@ -13,7 +13,6 @@ Rectangle {
         id: image
         source: "content/bg1.jpg"
         anchors.centerIn: parent
-        transformOrigin: Item.Center
         rotation: window.angle
 
         Behavior on rotation {
diff --git a/examples/declarative/dynamic/qml/PerspectiveItem.qml b/examples/declarative/dynamic/qml/PerspectiveItem.qml
index 3cbe64a..6d763c3 100644
--- a/examples/declarative/dynamic/qml/PerspectiveItem.qml
+++ b/examples/declarative/dynamic/qml/PerspectiveItem.qml
@@ -4,13 +4,12 @@ Image {
     id: tree
     property bool created: false
     property double scaleFactor: Math.max((y+height-250)*0.01, 0.3)
-    property double scaledBottom: y + (height+height*scaleFactor)/2 
+    property double scaledBottom: y + (height+height*scaleFactor)/2
     property bool onLand: scaledBottom > window.height/2
     property string image //Needed for compatibility with GenericItem
     opacity: onLand ? 1 : 0.25
     onCreatedChanged: if (created && !onLand) { tree.destroy() } else { z = scaledBottom }
     scale: scaleFactor
-    transformOrigin: "Center"
     source: image; smooth: true
     onYChanged: z = scaledBottom
 }
diff --git a/examples/declarative/listview/dynamic.qml b/examples/declarative/listview/dynamic.qml
index 236a9c5..952f6a7 100644
--- a/examples/declarative/listview/dynamic.qml
+++ b/examples/declarative/listview/dynamic.qml
@@ -56,7 +56,7 @@ Rectangle {
 
         Item {
             width: container.width; height: 55
-            
+
             Column {
                 id: moveButtons
                 x: 5; width: childrenRect.width; anchors.verticalCenter: parent.verticalCenter
@@ -84,7 +84,7 @@ Rectangle {
                     spacing: 5
                     Repeater {
                         model: attributes
-                        Component { 
+                        Component {
                             Text { text: description; color: "White" }
                         }
                     }
@@ -95,13 +95,12 @@ Rectangle {
                 id: itemButtons
 
                 anchors { right: removeButton.left; rightMargin: 35; verticalCenter: parent.verticalCenter }
-                width: childrenRect.width 
+                width: childrenRect.width
                 spacing: 10
 
                 Image {
                     source: "content/pics/list-add.png"
                     scale: clickUp.isPressed ? 0.9 : 1
-                    transformOrigin: Item.Center
 
                     ClickAutoRepeating {
                         id: clickUp
@@ -115,9 +114,8 @@ Rectangle {
                 Image {
                     source: "content/pics/list-remove.png"
                     scale: clickDown.isPressed ? 0.9 : 1
-                    transformOrigin: Item.Center
 
-                    ClickAutoRepeating { 
+                    ClickAutoRepeating {
                         id: clickDown
                         anchors.fill: parent
                         onClicked: fruitModel.setProperty(index, "cost", Math.max(0,cost-0.25))
@@ -158,7 +156,7 @@ Rectangle {
         }
         transitions: Transition {
             NumberAnimation { properties: "opacity"; duration: 400 }
-        } 
+        }
     }
 
     Row {
@@ -198,10 +196,10 @@ Rectangle {
             }
         }
 
-        Image { 
+        Image {
             source: "content/pics/archive-remove.png"
 
-            MouseArea { 
+            MouseArea {
                 anchors.fill: parent
                 onClicked: fruitModel.clear()
             }
diff --git a/examples/declarative/parallax/qml/ParallaxView.qml b/examples/declarative/parallax/qml/ParallaxView.qml
index 4b38d45..e869a21 100644
--- a/examples/declarative/parallax/qml/ParallaxView.qml
+++ b/examples/declarative/parallax/qml/ParallaxView.qml
@@ -18,9 +18,9 @@ Item {
         id: list
 
         currentIndex: root.currentIndex
-        onCurrentIndexChanged: root.currentIndex = currentIndex 
+        onCurrentIndexChanged: root.currentIndex = currentIndex
 
-        orientation: "Horizontal"
+        orientation: Qt.Horizontal
         boundsBehavior: Flickable.DragOverBounds
         anchors.fill: parent
         model: VisualItemModel { id: visualModel }
@@ -45,10 +45,10 @@ Item {
         anchors.horizontalCenter: parent.horizontalCenter
         width: Math.min(count * 50, parent.width - 20)
         interactive: width == parent.width - 20
-        orientation: "Horizontal"
+        orientation: Qt.Horizontal
 
-        delegate: Item { 
-            width: 50; height: 50 
+        delegate: Item {
+            width: 50; height: 50
             id: delegateRoot
 
             Image {
@@ -56,7 +56,6 @@ Item {
                 source: modelData.icon
                 smooth: true
                 scale: 0.8
-                transformOrigin: "Center"
             }
 
             MouseArea {
@@ -64,10 +63,10 @@ Item {
                 onClicked: { root.currentIndex = index }
             }
 
-            states: State { 
+            states: State {
                 name: "Selected"
                 when: delegateRoot.ListView.isCurrentItem == true
-                PropertyChanges { 
+                PropertyChanges {
                     target: image
                     scale: 1
                     y: -5
diff --git a/examples/declarative/parallax/qml/Smiley.qml b/examples/declarative/parallax/qml/Smiley.qml
index cfa4fed..662addc 100644
--- a/examples/declarative/parallax/qml/Smiley.qml
+++ b/examples/declarative/parallax/qml/Smiley.qml
@@ -8,7 +8,6 @@ Item {
     Image {
         anchors.horizontalCenter: parent.horizontalCenter
         source: "../pics/shadow.png"; y: smiley.minHeight + 58
-        transformOrigin: Item.Center
 
         // The scale property depends on the y position of the smiley face.
         scale: smiley.y * 0.5 / (smiley.minHeight - smiley.maxHeight)
@@ -32,7 +31,7 @@ Item {
                 from: smiley.minHeight; to: smiley.maxHeight
                 easing.type: Easing.OutExpo; duration: 300
             }
-            
+
             // Then move back to minHeight in 1 second, using the OutBounce easing function
             NumberAnimation {
                 from: smiley.maxHeight; to: smiley.minHeight
-- 
cgit v0.12


From e909d9a200c7a75dc23542f4603ce86fdc135bab Mon Sep 17 00:00:00 2001
From: Yann Bodson 
Date: Thu, 6 May 2010 13:11:48 +1000
Subject: Cleanup

---
 demos/declarative/snake/snake.qml                         | 6 +++---
 demos/declarative/webbrowser/content/FlickableWebView.qml | 6 +++---
 doc/src/declarative/elements.qdoc                         | 1 +
 examples/declarative/fonts/fonts.qml                      | 6 +++---
 examples/declarative/listview/sections.qml                | 2 +-
 examples/declarative/webview/alerts.qml                   | 2 +-
 6 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/demos/declarative/snake/snake.qml b/demos/declarative/snake/snake.qml
index 47bced4..bc4a974 100644
--- a/demos/declarative/snake/snake.qml
+++ b/demos/declarative/snake/snake.qml
@@ -60,7 +60,7 @@ Rectangle {
         Image {
             id: title
             source: "content/pics/snake.jpg"
-            fillMode: "PreserveAspectCrop"
+            fillMode: Image.PreserveAspectCrop
             anchors.fill: parent
             anchors.horizontalCenter: parent.horizontalCenter
             anchors.verticalCenter: parent.verticalCenter
@@ -69,7 +69,7 @@ Rectangle {
             Text {
                 color: "white"
                 font.pointSize: 24
-                horizontalAlignment: "AlignHCenter"
+                horizontalAlignment: Text.AlignHCenter
                 text: "Last Score:\t" + lastScore + "\nHighscore:\t" + highScores.topScore;
                 anchors.horizontalCenter: parent.horizontalCenter
                 anchors.bottom: parent.bottom
@@ -78,7 +78,7 @@ Rectangle {
         }
 
         source: "content/pics/background.png"
-        fillMode: "PreserveAspectCrop"
+        fillMode: Image.PreserveAspectCrop
 
         anchors.left: parent.left
         anchors.right: parent.right
diff --git a/demos/declarative/webbrowser/content/FlickableWebView.qml b/demos/declarative/webbrowser/content/FlickableWebView.qml
index 46f45e0..50ea97d 100644
--- a/demos/declarative/webbrowser/content/FlickableWebView.qml
+++ b/demos/declarative/webbrowser/content/FlickableWebView.qml
@@ -105,14 +105,14 @@ Flickable {
                     property: "scale"
                     from: 1
                     to: 0 // set before calling
-                    easing.type: "Linear"
+                    easing.type: Easing.Linear
                     duration: 200
                 }
                 NumberAnimation {
                     id: flickVX
                     target: flickable
                     property: "contentX"
-                    easing.type: "Linear"
+                    easing.type: Easing.Linear
                     duration: 200
                     from: 0 // set before calling
                     to: 0 // set before calling
@@ -121,7 +121,7 @@ Flickable {
                     id: flickVY
                     target: flickable
                     property: "contentY"
-                    easing.type: "Linear"
+                    easing.type: Easing.Linear
                     duration: 200
                     from: 0 // set before calling
                     to: 0 // set before calling
diff --git a/doc/src/declarative/elements.qdoc b/doc/src/declarative/elements.qdoc
index 79fe909..1dbc51b 100644
--- a/doc/src/declarative/elements.qdoc
+++ b/doc/src/declarative/elements.qdoc
@@ -142,6 +142,7 @@ The following table lists the QML elements provided by the \l {QtDeclarative}{Qt
 \o \l Loader
 \o \l Repeater
 \o \l SystemPalette
+\o \l FontLoader
 \o \l LayoutItem
 \endlist
 
diff --git a/examples/declarative/fonts/fonts.qml b/examples/declarative/fonts/fonts.qml
index ae31b03..f3eac48 100644
--- a/examples/declarative/fonts/fonts.qml
+++ b/examples/declarative/fonts/fonts.qml
@@ -51,9 +51,9 @@ Rectangle {
         }
         Text {
             text: {
-                if (webFont.status == 1) myText
-                else if (webFont.status == 2) "Loading..."
-                else if (webFont.status == 3) "Error loading font"
+                if (webFont.status == FontLoader.Ready) myText
+                else if (webFont.status == FontLoader.Loading) "Loading..."
+                else if (webFont.status == FontLoader.Error) "Error loading font"
             }
             color: "lightsteelblue"
             width: parent.width
diff --git a/examples/declarative/listview/sections.qml b/examples/declarative/listview/sections.qml
index 0a81f63..21f9f03 100644
--- a/examples/declarative/listview/sections.qml
+++ b/examples/declarative/listview/sections.qml
@@ -61,7 +61,7 @@ Rectangle {
             height: 20
             Text {
                 x: 2; height: parent.height
-                verticalAlignment: 'AlignVCenter'
+                verticalAlignment: Text.AlignVCenter
                 text: section
                 font.bold: true
             }
diff --git a/examples/declarative/webview/alerts.qml b/examples/declarative/webview/alerts.qml
index 6a5a0d2..7684c3e 100644
--- a/examples/declarative/webview/alerts.qml
+++ b/examples/declarative/webview/alerts.qml
@@ -52,7 +52,7 @@ WebView {
             font.pixelSize: 20
             width: webView.width*0.75
             wrapMode: Text.WordWrap
-            horizontalAlignment: "AlignHCenter"
+            horizontalAlignment: Text.AlignHCenter
         }
     }
 }
-- 
cgit v0.12


From 2dfa4fbcdc901b8cdd8df0087ecf5e3fa2523603 Mon Sep 17 00:00:00 2001
From: Yann Bodson 
Date: Thu, 6 May 2010 14:14:36 +1000
Subject: More cleanup

---
 demos/declarative/flickr/mobile/GridDelegate.qml       |  2 +-
 demos/declarative/flickr/mobile/ImageDetails.qml       | 12 ++++++++----
 demos/declarative/twitter/TwitterCore/FatDelegate.qml  |  2 +-
 demos/declarative/twitter/TwitterCore/HomeTitleBar.qml |  2 +-
 examples/declarative/listview/dynamic.qml              |  2 +-
 examples/declarative/listview/itemlist.qml             |  4 ++--
 examples/declarative/listview/listview-example.qml     |  4 ++--
 examples/declarative/scrollbar/ScrollBar.qml           | 16 ++++++++--------
 examples/declarative/scrollbar/display.qml             |  4 ++--
 9 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/demos/declarative/flickr/mobile/GridDelegate.qml b/demos/declarative/flickr/mobile/GridDelegate.qml
index eccdc34..df608bc 100644
--- a/demos/declarative/flickr/mobile/GridDelegate.qml
+++ b/demos/declarative/flickr/mobile/GridDelegate.qml
@@ -38,7 +38,7 @@
 
              states: [
                  State {
-                     name: "Show"; when: thumb.status == 1
+                     name: "Show"; when: thumb.status == Image.Ready
                      PropertyChanges { target: scaleMe; scale: 1 }
                  },
                  State {
diff --git a/demos/declarative/flickr/mobile/ImageDetails.qml b/demos/declarative/flickr/mobile/ImageDetails.qml
index 310c9df..caf1571 100644
--- a/demos/declarative/flickr/mobile/ImageDetails.qml
+++ b/demos/declarative/flickr/mobile/ImageDetails.qml
@@ -54,7 +54,11 @@ Flipable {
 
         Rectangle { anchors.fill: parent; color: "black"; opacity: 0.4 }
 
-        Common.Progress { anchors.centerIn: parent; width: 200; height: 18; progress: bigImage.progress; visible: bigImage.status!=1 }
+        Common.Progress {
+            anchors.centerIn: parent; width: 200; height: 18
+            progress: bigImage.progress; visible: bigImage.status != Image.Ready
+        }
+
         Flickable {
             id: flickable; anchors.fill: parent; clip: true
             contentWidth: imageContainer.width; contentHeight: imageContainer.height
@@ -69,7 +73,7 @@ Flipable {
                     anchors.centerIn: parent; smooth: !flickable.moving
                     onStatusChanged : {
                         // Default scale shows the entire image.
-                        if (status == 1 && width != 0) {
+                        if (status == Image.Ready && width != 0) {
                             slider.minimum = Math.min(flickable.width / width, flickable.height / height);
                             prevScale = Math.min(slider.minimum, 1);
                             slider.value = prevScale;
@@ -81,12 +85,12 @@ Flipable {
 
         Text {
             text: "Image Unavailable"
-            visible: bigImage.status == 'Error'
+            visible: bigImage.status == Image.Error
             anchors.centerIn: parent; color: "white"; font.bold: true
         }
 
         Common.Slider {
-            id: slider; visible: { bigImage.status == 1 && maximum > minimum }
+            id: slider; visible: { bigImage.status == Image.Ready && maximum > minimum }
             anchors {
                 bottom: parent.bottom; bottomMargin: 65
                 left: parent.left; leftMargin: 25
diff --git a/demos/declarative/twitter/TwitterCore/FatDelegate.qml b/demos/declarative/twitter/TwitterCore/FatDelegate.qml
index 62ee11a..72e5ecc 100644
--- a/demos/declarative/twitter/TwitterCore/FatDelegate.qml
+++ b/demos/declarative/twitter/TwitterCore/FatDelegate.qml
@@ -27,7 +27,7 @@ Component {
                 id: whiteRect; x: 6; width: 50; height: 50; color: "white"; smooth: true
                 anchors.verticalCenter: parent.verticalCenter
 
-                Loading { x: 1; y: 1; width: 48; height: 48; visible: realImage.status != 1 }
+                Loading { x: 1; y: 1; width: 48; height: 48; visible: realImage.status != Image.Ready }
                 Image { id: realImage; source: userImage; x: 1; y: 1; width:48; height:48 }
             }
             Text { id:txt; y:4; x: 56
diff --git a/demos/declarative/twitter/TwitterCore/HomeTitleBar.qml b/demos/declarative/twitter/TwitterCore/HomeTitleBar.qml
index 11aa74f..26ad1a9 100644
--- a/demos/declarative/twitter/TwitterCore/HomeTitleBar.qml
+++ b/demos/declarative/twitter/TwitterCore/HomeTitleBar.qml
@@ -37,7 +37,7 @@ Item {
             UserModel { user: rssModel.authName; id: userModel }
             Component { id: imgDelegate;
                 Item {
-                    Loading { width:48; height:48; visible: realImage.status != 1 }
+                    Loading { width:48; height:48; visible: realImage.status != Image.Ready }
                     Image { source: image; width:48; height:48; id: realImage }
                 }
             }
diff --git a/examples/declarative/listview/dynamic.qml b/examples/declarative/listview/dynamic.qml
index 952f6a7..9b05ad5 100644
--- a/examples/declarative/listview/dynamic.qml
+++ b/examples/declarative/listview/dynamic.qml
@@ -145,7 +145,7 @@ Rectangle {
 
         width: 8; height: view.height; anchors.right: view.right
         opacity: 0
-        orientation: "Vertical"
+        orientation: Qt.Vertical
         position: view.visibleArea.yPosition
         pageSize: view.visibleArea.heightRatio
 
diff --git a/examples/declarative/listview/itemlist.qml b/examples/declarative/listview/itemlist.qml
index e387f28..b73b3a3 100644
--- a/examples/declarative/listview/itemlist.qml
+++ b/examples/declarative/listview/itemlist.qml
@@ -33,7 +33,7 @@ Rectangle {
         anchors { fill: parent; bottomMargin: 30 }
         model: itemModel
         preferredHighlightBegin: 0; preferredHighlightEnd: 0
-        highlightRangeMode: "StrictlyEnforceRange"
+        highlightRangeMode: ListView.StrictlyEnforceRange
         orientation: ListView.Horizontal
         snapMode: ListView.SnapOneItem; flickDeceleration: 2000
     }
@@ -55,7 +55,7 @@ Rectangle {
                     radius: 3
                     color: view.currentIndex == index ? "blue" : "white"
 
-                    MouseArea { 
+                    MouseArea {
                         width: 20; height: 20
                         anchors.centerIn: parent
                         onClicked: view.currentIndex = index
diff --git a/examples/declarative/listview/listview-example.qml b/examples/declarative/listview/listview-example.qml
index 6feedf6..2e8cdda 100644
--- a/examples/declarative/listview/listview-example.qml
+++ b/examples/declarative/listview/listview-example.qml
@@ -75,7 +75,7 @@ Rectangle {
         highlight: petHighlight
         currentIndex: list1.currentIndex
         preferredHighlightBegin: 80; preferredHighlightEnd: 220
-        highlightRangeMode: "ApplyRange"
+        highlightRangeMode: ListView.ApplyRange
     }
 
     ListView {
@@ -87,7 +87,7 @@ Rectangle {
         highlight: Rectangle { color: "lightsteelblue" }
         currentIndex: list1.currentIndex
         preferredHighlightBegin: 125; preferredHighlightEnd: 125
-        highlightRangeMode: "StrictlyEnforceRange"
+        highlightRangeMode: ListView.StrictlyEnforceRange
         flickDeceleration: 1000
     }
 }
diff --git a/examples/declarative/scrollbar/ScrollBar.qml b/examples/declarative/scrollbar/ScrollBar.qml
index 5433156..c628a20 100644
--- a/examples/declarative/scrollbar/ScrollBar.qml
+++ b/examples/declarative/scrollbar/ScrollBar.qml
@@ -7,26 +7,26 @@ Item {
     // position and pageSize are in the range 0.0 - 1.0.  They are relative to the
     // height of the page, i.e. a pageSize of 0.5 means that you can see 50%
     // of the height of the view.
-    // orientation can be either 'Vertical' or 'Horizontal'
+    // orientation can be either Qt.Vertical or Qt.Horizontal
     property real position
     property real pageSize
-    property variant orientation : "Vertical"
+    property variant orientation : Qt.Vertical
 
     // A light, semi-transparent background
     Rectangle {
         id: background
         anchors.fill: parent
-        radius: orientation == 'Vertical' ? (width/2 - 1) : (height/2 - 1)
+        radius: orientation == Qt.Vertical ? (width/2 - 1) : (height/2 - 1)
         color: "white"
         opacity: 0.3
     }
     // Size the bar to the required size, depending upon the orientation.
     Rectangle {
-        x: orientation == 'Vertical' ? 1 : (scrollBar.position * (scrollBar.width-2) + 1)
-        y: orientation == 'Vertical' ? (scrollBar.position * (scrollBar.height-2) + 1) : 1
-        width: orientation == 'Vertical' ? (parent.width-2) : (scrollBar.pageSize * (scrollBar.width-2))
-        height: orientation == 'Vertical' ? (scrollBar.pageSize * (scrollBar.height-2)) : (parent.height-2)
-        radius: orientation == 'Vertical' ? (width/2 - 1) : (height/2 - 1)
+        x: orientation == Qt.Vertical ? 1 : (scrollBar.position * (scrollBar.width-2) + 1)
+        y: orientation == Qt.Vertical ? (scrollBar.position * (scrollBar.height-2) + 1) : 1
+        width: orientation == Qt.Vertical ? (parent.width-2) : (scrollBar.pageSize * (scrollBar.width-2))
+        height: orientation == Qt.Vertical ? (scrollBar.pageSize * (scrollBar.height-2)) : (parent.height-2)
+        radius: orientation == Qt.Vertical ? (width/2 - 1) : (height/2 - 1)
         color: "black"
         opacity: 0.7
     }
diff --git a/examples/declarative/scrollbar/display.qml b/examples/declarative/scrollbar/display.qml
index cb1da16..b8a5e36 100644
--- a/examples/declarative/scrollbar/display.qml
+++ b/examples/declarative/scrollbar/display.qml
@@ -37,7 +37,7 @@ Rectangle {
         width: 12; height: view.height-12
         anchors.right: view.right
         opacity: 0
-        orientation: "Vertical"
+        orientation: Qt.Vertical
         position: view.visibleArea.yPosition
         pageSize: view.visibleArea.heightRatio
     }
@@ -47,7 +47,7 @@ Rectangle {
         width: view.width-12; height: 12
         anchors.bottom: view.bottom
         opacity: 0
-        orientation: "Horizontal"
+        orientation: Qt.Horizontal
         position: view.visibleArea.xPosition
         pageSize: view.visibleArea.widthRatio
     }
-- 
cgit v0.12


From f95a53ec1f88f819424aa3e894f91c1b875fd749 Mon Sep 17 00:00:00 2001
From: Michael Brasser 
Date: Thu, 6 May 2010 14:29:27 +1000
Subject: Make sure to call base class implementation.

---
 src/declarative/graphicsitems/qdeclarativepainteditem.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/declarative/graphicsitems/qdeclarativepainteditem.cpp b/src/declarative/graphicsitems/qdeclarativepainteditem.cpp
index 6430fae..ce9b69f 100644
--- a/src/declarative/graphicsitems/qdeclarativepainteditem.cpp
+++ b/src/declarative/graphicsitems/qdeclarativepainteditem.cpp
@@ -210,6 +210,7 @@ void QDeclarativePaintedItem::geometryChanged(const QRectF &newGeometry,
     if (newGeometry.width() != oldGeometry.width() ||
         newGeometry.height() != oldGeometry.height())
         clearCache();
+    QDeclarativeItem::geometryChanged(newGeometry, oldGeometry);
 }
 
 QVariant QDeclarativePaintedItem::itemChange(GraphicsItemChange change,
-- 
cgit v0.12


From 3323eb86586240d8ddcde985d052478809a6bffb Mon Sep 17 00:00:00 2001
From: Yann Bodson 
Date: Thu, 6 May 2010 15:01:36 +1000
Subject: TextInput echoMode doc.

---
 src/declarative/graphicsitems/qdeclarativetextinput.cpp | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
index a1fa8c6..9ae4e1a 100644
--- a/src/declarative/graphicsitems/qdeclarativetextinput.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
@@ -706,14 +706,15 @@ bool QDeclarativeTextInput::hasAcceptableInput() const
 }
 
 /*!
-    \qmlproperty TextInput.EchoMode TextInput::echoMode
+    \qmlproperty enumeration TextInput::echoMode
 
     Specifies how the text should be displayed in the TextInput.
-    The default is Normal, which displays the text as it is. Other values
-    are Password, which displays asterixes instead of characters, NoEcho,
-    which displays nothing, and PasswordEchoOnEdit, which displays all but the
-    current character as asterixes.
-
+    \list
+    \o TextInput.Normal - Displays the text as it is. (Default)
+    \o TextInput.Password - Displays asterixes instead of characters.
+    \o TextInput.NoEcho - Displays nothing.
+    \o TextInput.PasswordEchoOnEdit - Displays all but the current character as asterixes.
+    \endlist
 */
 QDeclarativeTextInput::EchoMode QDeclarativeTextInput::echoMode() const
 {
@@ -1084,7 +1085,7 @@ void QDeclarativeTextInput::setPasswordCharacter(const QString &str)
    \qmlproperty string TextInput::displayText
 
    This is the text displayed in the TextInput.
-   
+
    If \l echoMode is set to TextInput::Normal, this holds the
    same value as the TextInput::text property. Otherwise,
    this property holds the text visible to the user, while
-- 
cgit v0.12


From d0a56df355cebc60176c3f449c1aee7bafd5562b Mon Sep 17 00:00:00 2001
From: Yann Bodson 
Date: Thu, 6 May 2010 15:52:38 +1000
Subject: qdoc fixes

---
 src/declarative/graphicsitems/qdeclarativegridview.cpp       |  4 ++--
 src/declarative/graphicsitems/qdeclarativeitem.cpp           |  2 +-
 src/declarative/graphicsitems/qdeclarativelistview.cpp       |  4 ++--
 src/declarative/graphicsitems/qdeclarativepathview.cpp       |  4 ++--
 src/declarative/graphicsitems/qdeclarativetextedit.cpp       |  2 +-
 .../graphicsitems/qdeclarativevisualitemmodel.cpp            |  2 +-
 src/declarative/util/qdeclarativeanimation.cpp               | 12 ++++++------
 7 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/declarative/graphicsitems/qdeclarativegridview.cpp b/src/declarative/graphicsitems/qdeclarativegridview.cpp
index 869826c..0094213 100644
--- a/src/declarative/graphicsitems/qdeclarativegridview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativegridview.cpp
@@ -1054,7 +1054,7 @@ void QDeclarativeGridView::setModel(const QVariant &model)
 }
 
 /*!
-    \qmlproperty component GridView::delegate
+    \qmlproperty Component GridView::delegate
 
     The delegate provides a template defining each item instantiated by the view.
     The index is exposed as an accessible \c index property.  Properties of the
@@ -1172,7 +1172,7 @@ int QDeclarativeGridView::count() const
 }
 
 /*!
-  \qmlproperty component GridView::highlight
+  \qmlproperty Component GridView::highlight
   This property holds the component to use as the highlight.
 
   An instance of the highlight component will be created for each view.
diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp
index 0395766..9433ba0 100644
--- a/src/declarative/graphicsitems/qdeclarativeitem.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp
@@ -720,7 +720,7 @@ void QDeclarativeKeyNavigationAttached::keyReleased(QKeyEvent *event)
 */
 
 /*!
-    \qmlproperty List