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: (51 commits)
  Revert "qmake: pass include directories to MS resource compiler"
  Fix User 46 Panic in bearer management on Symbian.
  Assistant: Insert all keywords with empty ids, as ids are not mendatory.
  qmake: delete .pdb file when making 'distclean' instead of 'clean'
  qmake: pass include directories to MS resource compiler
  use specified pkg-config
  qmake/symbian: Add icons with backslashes in pkg files
  Make qtconfig help messages translatable
  remove exec bits again ...
  Add TIFFClose to QTIffHandler::option() to avoid memory leak
  [QCocoaView scrollWheel:] can end up recursing infinitely when a scrollWheel event is sent to two stacked MDI windows
  Added missing QtWebKit example files and some whitespace fixes.
  Added missing native separator transforms.
  Doc: tuning search reasult box
  qdoc: Don't generate html output for png files.
  Doc: Correcting Windows CE 6.0 to Windows Embedded CE 6.0
  Doc: correcting bug - lenght() pointed to setLength() in "See also" section. Correct link is resize()
  Doc: correct spelling
  Doc: correcting spelling - qdbusxml2dcpp to qdbusxml2cpp
  Doc: correcting grammar on the installation pages
  ...

1 files changed, 10 insertions, 7 deletions

diff --git a/doc/src/getting-started/examples.qdoc b/doc/src/getting-started/examples.qdoc
index a5f3446..398eee8 100644
--- a/doc/src/getting-started/examples.qdoc
+++ b/doc/src/getting-started/examples.qdoc
@@ -7,11 +7,11 @@
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:FDL$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in a
-** written agreement between you and Nokia.
+** 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 Free Documentation License
 ** Alternatively, this file may be used under the terms of the GNU Free
@@ -32,7 +32,7 @@
    Qt includes a set of examples that cover nearly every aspect of Qt
    development. They aren't meant to be impressive when you run them,
    but in each case the source code has been carefully written to
-   illustrate one or more best Qt programming practices. 
+   illustrate one or more best Qt programming practices.
 
    You can run the examples from the \l{Examples and Demos Launcher}
    application (except see \l{QML Examples and Demos} {QML Examples}
@@ -764,6 +764,9 @@
     \row \o \l{webkit/googlechat}{Google Chat}
     \o A real-world example that shows how an existing Web-based service can be accessed
     using QtWebKit.
+    \row \o \l{webkit/imageanalyzer}{Image Analyzer}\raisedaster
+    \o A \l{The QtWebKit Bridge}{QtWebKit bridge} application which contains a
+    web interface and client-side processing.
     \row \o \l{webkit/previewer}{Previewer}\raisedaster
     \o Shows how to make a simple Web page previewer by using Qt's text input widgets
     together with a QWebView widget.
@@ -776,7 +779,7 @@
 */
 
 /*!
-    \page examples-helpsystem.html 
+    \page examples-helpsystem.html
     \ingroup all-examples
     \title Help System Examples
     \brief Adding interactive help to your Qt application.