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

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  typo for windows ce exclusion rule
  Updated .gitignore with the new name of the qmlviewer
  Fixed the close button of the find widget in Assistant
  Doc: brief Qt Quick introduction on "What's New" page.
  Interview Demo: Fix warning about pixmap leak on X11.
  Perform latin1 conversion directly on JSC::UString
  Avoid conversion between JavaScriptCore String type and QString
  Doc: Rephrase documentation for QColor::isValidColor and add \since 4.7.
  Use QList::reserve() in QDataStream>>QList
  Added static method isValidColor to QColor.
  compile fix with namespaces
  build fix for WinCE
  qDetectCPUFeatures: compile fix with namespaces
  compile fix for WinCE
  Mac: using Qt to write plugins disables quit for 3rd party application
  doc: Fixed building documentation
  Updated syncqt to use relative include paths on cygwin as well.

1 files changed, 24 insertions, 1 deletions

diff --git a/doc/src/qt4-intro.qdoc b/doc/src/qt4-intro.qdoc
index cf53df0..c670c51 100644
--- a/doc/src/qt4-intro.qdoc
+++ b/doc/src/qt4-intro.qdoc
@@ -473,6 +473,29 @@
 
     \section1 Declarative UI development with Qt Quick
 
+    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
+    technologies:
+
+    \list
+    \i QML is a declarative language oriented on JavaScript that utilizes
+    Qt's Meta-Object capabilities to enable designers and developers to
+    collaborate tightly and create animated and fluid user experiences,
+    using existing knowledge in script language and design.
+
+    \i QtDeclarative is a C++ library that provides the underlying engine,
+    which translates the declarative description of the UI in QML into
+    items on a QGraphicsScene. The library also provides APIs to bind
+    custom C++ types and elements to QML, and to connect the QML UI with
+    the underlying application logic written in C++.
+
+    \i Qt Creator has been improved to support interactive editing of
+    QML UIs through drag-and-drop. The text editor supports the QML
+    syntax and provides authoring assistance such as auto-completion,
+    error lookup, help lookup and easy preview of QML UI's.
+    \endlist
+
     \section1 Network Bearer Management
 
     Bearer Management controls the connectivity state of the system.
@@ -494,7 +517,7 @@
 
     \section1 New Classes, Functions, Macros, etc.
 
-    Links to new classes, functions, macros, and other items
+    Links to new classes, elements, functions, macros, and other items
     introduced in Qt 4.7.
 
     \sincelist 4.7