Merge remote branch 'qt/4.7' into qml-4.7

Conflicts:
	src/declarative/util/qdeclarativestateoperations.cpp

3 files changed, 4 insertions, 2 deletions

diff --git a/doc/src/development/developing-on-mac.qdoc b/doc/src/development/developing-on-mac.qdoc
index 20eefb7..1eb829e 100644
--- a/doc/src/development/developing-on-mac.qdoc
+++ b/doc/src/development/developing-on-mac.qdoc
@@ -72,10 +72,10 @@
     Carbon Qt can be developed on and deployed to 10.4, but there is no 64-bit
     support.
 
-    With Qt 4.7 we now reccommend using the Cocoa version of Qt for developement,
+    With Qt 4.7 we now recommend using the Cocoa version of Qt for development,
     unless you want to target the 10.4 platform. Qt now uses Cocoa by default,
     both for the binary package and when configuring from source. Download the 
-    Carbon binarypackages or configure with "-carbon" to use that version.
+    Carbon binary packages or configure with "-carbon" to use that version.
 
     There are two versions of the Qt binary, one with x86 and x86_64
     Cocoa and another with x86 and ppc Carbon. If you want a different setup
diff --git a/doc/src/images/quick_screens.png b/doc/src/images/quick_screens.png
new file mode 100644
index 0000000..76b25d9
--- /dev/null
+++ b/doc/src/images/quick_screens.png
diff --git a/doc/src/qt4-intro.qdoc b/doc/src/qt4-intro.qdoc
index c670c51..ba9821a 100644
--- a/doc/src/qt4-intro.qdoc
+++ b/doc/src/qt4-intro.qdoc
@@ -473,6 +473,8 @@
 
     \section1 Declarative UI development with Qt Quick
 
+    \image quick_screens.png
+
     Qt 4.7 introduces Quick, the Qt UI Creation Kit. that enables the creation
     of dynamic user interfaces, easier and more effective than possible
     with existing UI technologies. This UI Creation Kit consist of three