Merge remote branch 'origin/4.7' into qt-master-from-4.7

Conflicts:
	examples/webkit/imageanalyzer/imageanalyzer.h
	examples/webkit/imageanalyzer/mainwindow.h
	mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h
	src/corelib/io/qfsfileengine_iterator_unix.cpp
	src/corelib/io/qfsfileengine_iterator_win.cpp
	src/corelib/kernel/qcoreapplication.cpp
	src/network/access/qnetworkaccessdatabackend.cpp
	src/plugins/bearer/connman/qconnmanservice_linux.cpp
	src/plugins/platforms/openvglite/qwindowsurface_vglite.h
	src/s60installs/bwins/QtCoreu.def
	src/s60installs/eabi/QtCoreu.def
	src/s60installs/s60installs.pro
	tools/assistant/tools/assistant/helpviewer_qwv.h
	tools/qdoc3/test/qt-html-templates.qdocconf

1 files changed, 12 insertions, 4 deletions

diff --git a/doc/src/snippets/declarative/codingconventions/photo.qml b/doc/src/snippets/declarative/codingconventions/photo.qml
index 2eba035..78c5068 100644
--- a/doc/src/snippets/declarative/codingconventions/photo.qml
+++ b/doc/src/snippets/declarative/codingconventions/photo.qml
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -49,12 +49,20 @@ Rectangle {
 
     signal clicked                                          // signal declarations
 
-    function doSomething(x) {                               // javascript functions
+    function doSomething(x)                                 // javascript functions
+    {                               
         return x + photoImage.width
     }
 
-    x: 20; y: 20; width: 200; height: 150                   // object properties
-    color: "gray"                                           // try to group related properties together
+    color: "gray"                                           // object properties
+    x: 20; y: 20; height: 150                               // try to group related properties together
+    width: {                                                // large bindings
+        if(photoImage.width > 200){
+	    photoImage.width;
+	}else{
+	    200;
+	}
+    }
 
     Rectangle {                                             // child objects
         id: border