Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7

4 files changed, 15 insertions, 29 deletions

diff --git a/doc/src/examples/webkit-bridge-imageanalyzer.qdoc b/doc/src/examples/webkit-bridge-imageanalyzer.qdoc
index efc5623..b8c42c6 100644
--- a/doc/src/examples/webkit-bridge-imageanalyzer.qdoc
+++ b/doc/src/examples/webkit-bridge-imageanalyzer.qdoc
@@ -37,6 +37,9 @@ user interface, displaying web content written in HTML/JavaScript. The
 application uses QtConcurrent to distribute its work across as many CPU cores as
 are available from the system, so it can process each image in parallel.
 
+For the full reference documentation of QtWebKit hybrid development, see 
+\l{qtwebkit-bridge.html}{The QtWebKit Bridge}.
+
 Initially, you will see a user interface with an empty list of images. Clicking
 on some of the images in the lower pane below adds them to the list view above,
 as shown in the screenshot below.
@@ -54,8 +57,8 @@ each image are shown.
 
     \image webkit-imageanalyzer-complete.png
 
-The MainWindow is defined in C++, and creates a \c QNetworkCache and a
-\c QWebView, and tells the \c QWebView to load the starting page, providing us
+The MainWindow is defined in C++, and creates a \l QNetworkDiskCache and a
+\l QWebView, and tells the \l QWebView to load the starting page, providing us
 with a user interface for the client.
 
   \snippet examples/webkit/imageanalyzer/mainwindow.cpp MainWindow - constructor
@@ -67,8 +70,8 @@ likely be retrieved from the network rather than from resources.
 
 We wish to initialize an object reference in the JavaScript web page to point
 to our \tt ImageAnalyzer before any other scripts are run. To do this, we
-connect the \c javaScriptWindowObjectCleared() signal to a slot which does the
-object creation and handoff to JavaScript.
+connect the \l{QWebFrame::}{javaScriptWindowObjectCleared()} signal to a slot
+which does the object creation and handoff to JavaScript.
 
   \snippet examples/webkit/imageanalyzer/mainwindow.cpp MainWindow - addJSObject
 
@@ -94,14 +97,15 @@ When the user clicks the \bold {Analyze} button, \c analyzeImages() is called,
 another regular JavaScript method, shown below.
 Notice it assumes the \c imageAnalyzer object is already defined and initialized
 in JavaScript space, but we guaranteed that by connecting our setup slot to the
-appropriate signal, \c javaScriptWindowObjectCleared().
+appropriate signal, \l{QWebFrame::}{javaScriptWindowObjectCleared()}.
 
     \snippet examples/webkit/imageanalyzer/resources/index.html analyzeImages
 
 The only methods on \c ImageAnalyzer that we can or do call from JavaScript are
-those which are exposed through Qt's MetaObject system: property getter/setter
-methods,
-\c public \c slots, \c signals, and other \c Q_INVOKABLE functions.
+those which are exposed through \{The Meta-Object System}{Qt's MetaObject}
+system: \l{The Property System}{property} getter/setter methods,
+\c public \l {Signals & Slots}{signals and slots}, and other 
+\l{Q_INVOKABLE}{Q_INVOKABLE} functions.
 
 \snippet examples/webkit/imageanalyzer/imageanalyzer.h ImageAnalyzer - public interface
 \dots
@@ -138,13 +142,13 @@ will load them into a QImage when the data is ready.
 \snippet examples/webkit/imageanalyzer/imageanalyzer.cpp ImageAnalyzer - handleReply
 
 After the images are loaded, they are queued up in preparation to be
-sent in a batch for analysis to a \c QFutureWatcher, which will distribute the
+sent in a batch for analysis to a \l QFutureWatcher, which will distribute the
 processing across multiple threads and cores, depending on how many are available.
 
 \snippet examples/webkit/imageanalyzer/imageanalyzer.cpp ImageAnalyzer - queueImage
 
 The function that gets performed on each image is \c averageRGB(),
-as specified in argument 2 to the \c QtConcurrent::mapped() function.
+as specified in argument 2 to the \l{QtConcurrent::mapped()} function.
 Notice it repeats the same calculations 100 times on each pixel to keep the CPU
 very busy. This is done only for the purposes of the demo so that the analysis
 takes a noticeable time to complete.
diff --git a/doc/src/frameworks-technologies/phonon.qdoc b/doc/src/frameworks-technologies/phonon.qdoc
index 83afb91..9620136 100644
--- a/doc/src/frameworks-technologies/phonon.qdoc
+++ b/doc/src/frameworks-technologies/phonon.qdoc
@@ -524,24 +524,5 @@
     the QtOpenGL shared library. If this is not what you want, it is
     possible to configure Qt without OpenGL support. In that case, you
     need to run \c configure with the \c -no-opengl option.
-
-    \section1 Work in Progress
-
-    Phonon and its Qt backends, though fully functional for
-    multimedia playback, are still under development. Functionality to
-    come is the possibility to capture media and more processors for
-    both music and video files.
-
-    Another important consideration is to implement support for
-    storing media to files; i.e., not playing back media directly.
-
-    We also hope in the future to be able to support direct
-    manipulation of media streams. This will give the programmer more
-    freedom to manipulate streams than just through processors.
-
-    Currently, the multimedia framework supports one input source. It will be
-    possible to include several sources. This is useful in, for example, audio
-    mixer applications where several audio sources can be sent, processed and
-    output as a single audio stream.
 */
 
diff --git a/doc/src/images/webkit-imageanalyzer-screenshot.png b/doc/src/images/webkit-imageanalyzer-screenshot.png
index 987f8a2..c96371a 100644
--- a/doc/src/images/webkit-imageanalyzer-screenshot.png
+++ b/doc/src/images/webkit-imageanalyzer-screenshot.png
diff --git a/doc/src/template/style/style.css b/doc/src/template/style/style.css
index 3dcea96..ec0202a 100755
--- a/doc/src/template/style/style.css
+++ b/doc/src/template/style/style.css
@@ -664,6 +664,7 @@
 
 	#resultdialog.active {
 	  display: block;
+	  width:30%;
 	}
 
 	#resultdialog #resultclose {