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

29 files changed, 1138 insertions, 1236 deletions

diff --git a/doc/src/classes/phonon-api.qdoc b/doc/src/classes/phonon-api.qdoc
index 641b936..6fe0223 100644
--- a/doc/src/classes/phonon-api.qdoc
+++ b/doc/src/classes/phonon-api.qdoc
@@ -1577,7 +1577,6 @@
     \since 4.4
     \brief The MediaObject class provides an interface for media playback.
 
-
     The media object manages a \l{Phonon::}{MediaSource}, which
     supplies the media object with multimedia content, e.g., from a
     file. A playback in Phonon is always started by calling the
@@ -1651,17 +1650,8 @@
     playback of the current source, but it is possible to try with a
     different one. A user readable error message is given by
     errorString().
-    \section1 Symbian Platform Security Requirements
-
-    On Symbian, processes which access media via the network must
-    have the \c NetworkServices platform security capability. If the client
-    process lacks this capability, operations will result in errors.
-    This failure is indicated by a state() of Phonon::ErrorState.
-
-    Platform security capabilities are added via the
-    \l{qmake-variable-reference.html#target-capability}{TARGET.CAPABILITY}
-    qmake variable.
 
+    \sa {Symbian Platform Security Requirements}
     \sa Phonon::MediaSource, Phonon::AudioOutput, VideoWidget,
     {Music Player Example}, {Phonon Overview}, Phonon::VideoPlayer,
     Phonon::createPlayer(), {Phonon Module}
diff --git a/doc/src/declarative/advtutorial.qdoc b/doc/src/declarative/advtutorial.qdoc
index afedb44..1341bbb 100644
--- a/doc/src/declarative/advtutorial.qdoc
+++ b/doc/src/declarative/advtutorial.qdoc
@@ -164,14 +164,22 @@ The \c createBlock() function creates a block from the \c Block.qml file
 and moves the new block to its position on the game canvas. This involves several steps:
 
 \list
-\o \l {QML:Qt::createComponent()}{Qt.createComponent()} is called to generate an element from \c Block.qml.
-   If the component is ready, we can call \c createObject() to create an instance of the \c Block item.
-\o If \c createObject() returned null (i.e. if there was an error while
-   loading the object), print the error information.
-\o Place the block in its position on the board and set its width and height.
-   Also, store it in the blocks array for future reference.
-\o Finally, print error information to the console if the component could not be
-   loaded for some reason (for example, if the file is missing).
+
+\o \l {QML:Qt::createComponent()}{Qt.createComponent()} is called to
+   generate an element from \c Block.qml.  If the component is ready,
+   we can call \c createObject() to create an instance of the \c Block
+   item.
+
+\o If \c createObject() returned null (i.e. if there was an error
+   while loading the object), print the error information.
+
+\o Place the block in its position on the board and set its width and
+   height.  Also, store it in the blocks array for future reference.
+
+\o Finally, print error information to the console if the component
+   could not be loaded for some reason (for example, if the file is
+   missing).
+
 \endlist
 
 
diff --git a/doc/src/declarative/anchor-layout.qdoc b/doc/src/declarative/anchor-layout.qdoc
index 9c217e1..5c025e5 100644
--- a/doc/src/declarative/anchor-layout.qdoc
+++ b/doc/src/declarative/anchor-layout.qdoc
@@ -33,7 +33,10 @@
 In addition to the more traditional \l Grid, \l Row, and \l Column,
 QML also provides a way to layout items using the concept of \e anchors.
 Each item can be thought of as having a set of 7 invisible "anchor lines":
-\e left, \e horizontalCenter, \e right, \e top, \e verticalCenter, \e baseline, and \e bottom.
+\l {Item::anchors.left}{left}, \l {Item::anchors.horizontalCenter}{horizontalCenter},
+\l {Item::anchors.right}{right}, \l {Item::anchors.top}{top}, 
+\l {Item::anchors.verticalCenter}{verticalCenter}, \l {Item::anchors.baseline}{baseline},
+and \l {Item::anchors.bottom}{bottom}.
 
 \image edges_qml.png
 
diff --git a/doc/src/declarative/basictypes.qdoc b/doc/src/declarative/basictypes.qdoc
index 109e6d5..e327d4a 100644
--- a/doc/src/declarative/basictypes.qdoc
+++ b/doc/src/declarative/basictypes.qdoc
@@ -107,6 +107,9 @@
     Text { text: "Hello world!" }
     \endqml
 
+    Strings have a \c length attribute that holds the number of
+    characters in the string.
+
     \sa {QML Basic Types}
 */
 
diff --git a/doc/src/declarative/declarativeui.qdoc b/doc/src/declarative/declarativeui.qdoc
index cd27c40..217e372 100644
--- a/doc/src/declarative/declarativeui.qdoc
+++ b/doc/src/declarative/declarativeui.qdoc
@@ -37,7 +37,9 @@ custom user interfaces from a rich set of \l {QML Elements}{QML elements}.
 Qt Quick helps programmers and designers collaborate to
 build the fluid user interfaces that are becoming common in portable
 consumer devices, such as mobile phones, media players, set-top boxes
-and netbooks.
+and netbooks. Qt Quick consists of the QtDeclarative C++ module, QML, and
+the integration of both of these into the Qt Creator IDE. Using the QtDeclarative
+C++ module, you can load and interact with QML files from your Qt application.
 
 QML is an extension to \l
 {http://www.ecma-international.org/publications/standards/Ecma-262.htm}
@@ -58,7 +60,7 @@ complete internet-enabled applications like a \l
 Qt Quick builds on \l {QML for Qt programmers}{Qt's existing
 strengths}.  QML can be be used to incrementally extend an existing
 application or to build completely new applications.  QML is fully \l
-{Extending QML in C++}{extensible from C++}.
+{Extending QML in C++}{extensible from C++} through the QtDeclarative Module.
 
 \section1 Getting Started
 
diff --git a/doc/src/declarative/elements.qdoc b/doc/src/declarative/elements.qdoc
index 0edd242..c2930b3 100644
--- a/doc/src/declarative/elements.qdoc
+++ b/doc/src/declarative/elements.qdoc
@@ -113,7 +113,7 @@ The following table lists the QML elements provided by the \l {QtDeclarative}{Qt
 \row \o \l {Connections} \o Explicitly connects signals and signal handlers
 \row \o \l {Component} \o Encapsulate QML items as a component
 \row \o \l {Timer} \o Provides timed triggers 
-\row \o \l {QtObject} \o Basic element containing only the objectName property
+\row \o \l {QML:QtObject} {QtObject} \o Basic element containing only the objectName property
 \row \o \l {WorkerScript} \o Enables the use of threads in QML
 \row \o \l {Loader} \o Controls the loading of items or components
 \row \o \l {Repeater} \o Uses a model to create multiples of components
diff --git a/doc/src/declarative/extending-tutorial.qdoc b/doc/src/declarative/extending-tutorial.qdoc
index 2cf00b9..cc93e86 100644
--- a/doc/src/declarative/extending-tutorial.qdoc
+++ b/doc/src/declarative/extending-tutorial.qdoc
@@ -48,8 +48,9 @@ Tutorial chapters:
 \o \l{declarative/tutorials/extending/chapter2-methods}{Connecting to C++ Methods and Signals}
 \o \l{declarative/tutorials/extending/chapter3-bindings}{Adding Property Bindings}
 \o \l{declarative/tutorials/extending/chapter4-customPropertyTypes}{Using Custom Property Types}
-\o \l{declarative/tutorials/extending/chapter5-plugins}{Writing an Extension Plugin}
-\o \l{qml-extending-tutorial6.html}{In Summary}
+\o \l{declarative/tutorials/extending/chapter5-listproperties}{Using List Property Types}
+\o \l{declarative/tutorials/extending/chapter6-plugins}{Writing an Extension Plugin}
+\o \l{qml-extending-tutorial7.html}{In Summary}
 \endlist
 
 */
@@ -59,61 +60,94 @@ Tutorial chapters:
 
 \example declarative/tutorials/extending/chapter1-basics
 
-Let's create a new QML type called "Musician" that has two properties: a name
-and an instrument.  We will make it available in a \l {Modules}{module} called "Music", with
+A common task when extending QML is to provide a new QML type that supports some
+ custom functionality beyond what is provided by the built-in \l {QML Elements}.
+For example, this could be done to implement particular data models, or provide
+elements with custom painting and drawing capabilities, or access system features
+like network programming that are not accessible through built-in QML features.
+
+In this tutorial, we will show how to use the C++ classes in the QtDeclarative
+module to extend QML. The end result will be a simple Pie Chart display implemented by
+several custom QML types connected together through QML features like bindings and 
+signals, and made available to the QML runtime through a plugin.
+
+To begin with, let's create a new QML type called "PieChart" that has two properties: a name
+and a color.  We will make it available in a \l {Modules}{module} called "Charts", with
 a module version of 1.0. 
-We want this \c Musician type to be usable from QML like this:
+
+We want this \c PieChart type to be usable from QML like this:
 
 \code
-    import Music 1.0
+    import Charts 1.0
     
-    Musician {
-        name: "Reddy the Rocker"
-        instrument: "Guitar"
+    PieChart {
+        width: 100; height: 100
+        name: "A simple pie chart"
+        color: "red"
     }
 \endcode
 
-To do this, we need a C++ class that encapsulates this \c Musician type and its two
-properties. Since QML relies heavily on Qt's \l{Meta-Object System}{meta object system},
+To do this, we need a C++ class that encapsulates this \c PieChart type and its two
+properties. Since QML makes extensive use of Qt's \l{Meta-Object System}{meta object system},
 this new class must:
 
 \list
-\o inherit from QObject
-\o declare its properties using the Q_PROPERTY() macro
+\o Inherit from QObject
+\o Declare its properties using the Q_PROPERTY macro
 \endlist
 
-Here is our \c Musician class, defined in \c musician.h:
+Here is our \c PieChart class, defined in \c piechart.h:
 
-\snippet declarative/tutorials/extending/chapter1-basics/musician.h 0
+\snippet declarative/tutorials/extending/chapter1-basics/piechart.h 0
 
-It defines the two properties, \c name and \c instrument, with the Q_PROPERTY() macro.
-The class implementation in \c musician.cpp simply sets and returns the \c m_name and
-\c m_instrument values as appropriate.
+The class inherits from QDeclarativeItem because we want to override 
+QDeclarativeItem::paint() in order to draw. If the class just represented some
+data type and was not an item that actually needed to be displayed, it could simply inherit
+from QObject. Or, if we want to extend the functionality of an existing QObject-based 
+class, it could inherit from that class instead.
 
-Our QML file, \c app.qml, creates a \c Musician item and display the musician's details
+The \c PieChart class defines the two properties, \c name and \c color, with the Q_PROPERTY macro,
+and overrides QDeclarativeItem::paint(). The class implementation in \c piechart.cpp 
+simply sets and returns the \c m_name and \c m_color values as appropriate, and 
+implements \c paint() to draw a simple pie chart. It also turns off the 
+QGraphicsItem::ItemHasNoContents flag to enable painting:
+
+\snippet declarative/tutorials/extending/chapter1-basics/piechart.cpp 0
+\dots 0
+\snippet declarative/tutorials/extending/chapter1-basics/piechart.cpp 1
+
+Now that we have defined the \c PieChart type, we will use it from QML. The \c app.qml
+file creates a \c PieChart item and display the pie chart's details
 using a standard QML \l Text item:
 
 \snippet declarative/tutorials/extending/chapter1-basics/app.qml 0
 
+Notice that although the color is specified as a string in QML, it is automatically
+converted to a QColor object for the PieChart \c color property. Automatic conversions are
+provided for various other \l {QML Basic Types}{basic types}; for example, a string
+like "640x480" can be automatically converted to a QSize value.
+
 We'll also create a C++ application that uses a QDeclarativeView to run and
-display \c app.qml. The application must register the \c Musician type
+display \c app.qml. The application must register the \c PieChart type
 using the qmlRegisterType() function, to allow it to be used from QML. If
-you don't register the type, \c app.qml won't be able to create a \c Musician.
+you don't register the type, \c app.qml won't be able to create a \c PieChart.
 
 Here is the application \c main.cpp:
 
 \snippet declarative/tutorials/extending/chapter1-basics/main.cpp 0
 
-This call to qmlRegisterType() registers the \c Musician type as a type called "Musician", in a module named "Music",
+This call to qmlRegisterType() registers the \c PieChart type as a type called "PieChart", in a module named "Charts",
 with a module version of 1.0.
 
 Lastly, we write a \c .pro project file that includes the files and the \c declarative library:
 
 \quotefile declarative/tutorials/extending/chapter1-basics/chapter1-basics.pro
 
-Now we can build and run the application. Try it yourself with the code in Qt's \c examples/tutorials/extending/chapter1-basics directory.
+Now we can build and run the application:
 
-\example declarative/tutorials/extending/chapter1-basics
+\image extending-tutorial-chapter1.png
+
+Try it yourself with the code in Qt's \c examples/tutorials/extending/chapter1-basics directory.
 
 At the moment, the \c app.qml is run from within a C++ application.
 This may seem odd if you're used to running QML files with the \l {QML Viewer}.
@@ -128,39 +162,40 @@ Later on, we'll show how to create a plugin so that you can run \c app.qml using
 
 \example declarative/tutorials/extending/chapter2-methods
 
-Suppose we want \c Musician to have a "perform" method that prints a message
-to the console and then emits a "performanceEnded" signal.
-Other elements would be able to call \c perform() and receive
-\c performanceEnded() signals like this:
+Suppose we want \c PieChart to have a "clearChart()" method that erases the
+chart and then emits a "chartCleared" signal. Our \c app.qml would be able 
+to call \c clearChart() and receive \c chartCleared() signals like this:
 
 \snippet declarative/tutorials/extending/chapter2-methods/app.qml 0
 
-To do this, we add a \c perform() method and a \c performanceEnded() signal
+\image extending-tutorial-chapter2.png
+
+To do this, we add a \c clearChart() method and a \c chartCleared() signal
 to our C++ class:
 
-\snippet declarative/tutorials/extending/chapter2-methods/musician.h 0
+\snippet declarative/tutorials/extending/chapter2-methods/piechart.h 0
 \dots
-\snippet declarative/tutorials/extending/chapter2-methods/musician.h 1
+\snippet declarative/tutorials/extending/chapter2-methods/piechart.h 1
 \dots
-\snippet declarative/tutorials/extending/chapter2-methods/musician.h 2
+\snippet declarative/tutorials/extending/chapter2-methods/piechart.h 2
 \dots
-\snippet declarative/tutorials/extending/chapter2-methods/musician.h 3
+\snippet declarative/tutorials/extending/chapter2-methods/piechart.h 3
 
-The use of Q_INVOKABLE makes the \c perform() method available to the
+The use of Q_INVOKABLE makes the \c clearChart() method available to the
 Qt Meta-Object system, and in turn, to QML. Note that it could have
 been declared as as a Qt slot instead of using Q_INVOKABLE, as
 slots are also callable from QML. Both of these approaches are valid.
 
-The \c perform() method simply prints a message to the console and
-then emits \c performanceEnded():
+The \c clearChart() method simply changes the color to Qt::transparent,
+repaints the chart, then emits the \c chartCleared() signal:
 
-\snippet declarative/tutorials/extending/chapter2-methods/musician.cpp 0
+\snippet declarative/tutorials/extending/chapter2-methods/piechart.cpp 0
 
-Now when we run the application and click the window, the application outputs:
+Now when we run the application and click the window, the pie chart
+disappears, and the application outputs:
 
 \code
-    "Reddy the Rocker" is playing the "Guitar"
-    The performance has now ended
+    The chart has been cleared
 \endcode
 
 Try out the example yourself with the updated code in Qt's \c examples/tutorials/extending/chapter2-methods directory.
@@ -174,45 +209,49 @@ Try out the example yourself with the updated code in Qt's \c examples/tutorials
 
 Property bindings is a powerful feature of QML that allows values of different
 elements to be synchronized automatically. It uses signals to notify and update
-other elements' values when property values change.
+other elements' values when property values are changed.
 
-Let's enable property bindings for the \c instrument property. That means 
+Let's enable property bindings for the \c color property. That means 
 if we have code like this:
 
 \snippet declarative/tutorials/extending/chapter3-bindings/app.qml 0
 
-The "instrument: reddy.instrument" statement binds the \c instrument value of
-\c craig to the \c instrument of \c reddy.
-Whenever \c reddy's \c instrument value changes, \c craig's \c instrument value
-updates to the same value. When the window is clicked, the application outputs:
+\image extending-tutorial-chapter3.png
 
-\code
-    "Reddy the Rocker" is playing the "Guitar"
-    "Craig the Copycat" is playing the "Guitar"
-    "Reddy the Rocker" is playing the "Drums"
-    "Craig the Copycat" is playing the "Drums"
-\endcode
+The "color: chartA.color" statement binds the \c color value of
+\c chartB to the \c color of \c chartA.
+Whenever \c chartA's \c color value changes, \c chartB's \c color value
+updates to the same value. When the window is clicked, the \c onClicked
+handler in the MouseArea changes the color of \c chartA, thereby changing
+both charts to the color blue.
 
-It's easy to enable property binding for the \c instrument property. 
-We add a \l{Qt's Property System}{NOTIFY} feature to its Q_PROPERTY() declaration to indicate that a "instrumentChanged" signal
+It's easy to enable property binding for the \c color property. 
+We add a \l{Qt's Property System}{NOTIFY} feature to its Q_PROPERTY() declaration to indicate that a "colorChanged" signal
 is emitted whenever the value changes.
 
-\snippet declarative/tutorials/extending/chapter3-bindings/musician.h 0
+\snippet declarative/tutorials/extending/chapter3-bindings/piechart.h 0
 \dots
-\snippet declarative/tutorials/extending/chapter3-bindings/musician.h 1
+\snippet declarative/tutorials/extending/chapter3-bindings/piechart.h 1
 \dots
-\snippet declarative/tutorials/extending/chapter3-bindings/musician.h 2
+\snippet declarative/tutorials/extending/chapter3-bindings/piechart.h 2
 \dots
-\snippet declarative/tutorials/extending/chapter3-bindings/musician.h 3
+\snippet declarative/tutorials/extending/chapter3-bindings/piechart.h 3
 
-Then, we emit this signal in \c setInstrument():
+Then, we emit this signal in \c setPieSlice():
 
-\snippet declarative/tutorials/extending/chapter3-bindings/musician.cpp 0
+\snippet declarative/tutorials/extending/chapter3-bindings/piechart.cpp 0
 
-It's important for \c setInstrument() to check that the instrument value has actually changed
-before emitting \c instrumentChanged(). This ensures the signal is not emitted unnecessarily and
+It's important for \c setColor() to check that the color value has actually changed
+before emitting \c colorChanged(). This ensures the signal is not emitted unnecessarily and
 also prevents loops when other elements respond to the value change.
 
+The use of bindings is essential to QML. You should always add NOTIFY 
+signals for properties if they are able to be implemented, so that your
+properties can be used in bindings. Properties that cannot be bound cannot be
+automatically updated and cannot be used as flexibly in QML. Also, since
+bindings are invoked so often and relied upon in QML usage, users of your
+custom QML types may see unexpected behavior if bindings are not implemented.
+
 */
 
 /*!
@@ -220,19 +259,19 @@ also prevents loops when other elements respond to the value change.
 
 \example declarative/tutorials/extending/chapter4-customPropertyTypes
 
-The \c Musician type currently has two properties that are both strings. 
-It could have all sorts of other properties. For example, we could add an
-integer-type property to store the age of each musician:
+The \c PieChart type currently has a string-type property and a color-type property.
+It could have many other types of properties. For example, we could add an
+integer-type property to store an identifier for each pie chart:
 
 \code
-    class Musician : public QObject
+    class PieChart : public QDeclarativeItem
     {
         ...
-        Q_PROPERTY(int age READ age WRITE setAge)
+        Q_PROPERTY(int id READ id WRITE setId)
     public:
         ...
-        int age() const;
-        void setAge(int age);
+        int id() const;
+        void setId(int id);
         ...
     };
 \endcode
@@ -257,31 +296,39 @@ types:
 If we want to create a property whose type is not supported by QML by default,
 we need to register the type with QML.
 
-For example, let's change the type of the \c instrument property from a string to a
-new type called "Instrument". Instead of assigning a string value to \c instrument,
-we assign an \c Instrument value:
+For example, let's replace the use of the \c property with a type called 
+"PieSlice" that has a \c color property. Instead of assigning a color,
+we assign an \c PieSlice value which itself contains a \c color:
 
 \snippet declarative/tutorials/extending/chapter4-customPropertyTypes/app.qml 0
 
-Like \c Musician, this new \c Instrument type has to inherit from QObject and declare
+Like \c PieChart, this new \c PieSlice type inherits from QDeclarativeItem and declares
 its properties with Q_PROPERTY():
 
-\snippet declarative/tutorials/extending/chapter4-customPropertyTypes/instrument.h 0
+\snippet declarative/tutorials/extending/chapter4-customPropertyTypes/pieslice.h 0
 
-To use it from \c Musician, we modify the \c instrument property declaration
+To use it in \c PieChart, we modify the \c color property declaration
 and associated method signatures:
 
-\snippet declarative/tutorials/extending/chapter4-customPropertyTypes/musician.h 0
+\snippet declarative/tutorials/extending/chapter4-customPropertyTypes/piechart.h 0
 \dots
-\snippet declarative/tutorials/extending/chapter4-customPropertyTypes/musician.h 1
+\snippet declarative/tutorials/extending/chapter4-customPropertyTypes/piechart.h 1
 \dots
-\snippet declarative/tutorials/extending/chapter4-customPropertyTypes/musician.h 2
+\snippet declarative/tutorials/extending/chapter4-customPropertyTypes/piechart.h 2
 \dots
-\snippet declarative/tutorials/extending/chapter4-customPropertyTypes/musician.h 3
+\snippet declarative/tutorials/extending/chapter4-customPropertyTypes/piechart.h 3
+
+There is one thing to be aware of when implementing \c setPieSlice(). The \c PieSlice
+is a visual item, so it must be set as a child of the \c PieChart using
+QDeclarativeItem::setParentItem() so that the \c PieChart knows to paint this child
+item when its contents are drawn:
+
+\snippet declarative/tutorials/extending/chapter4-customPropertyTypes/piechart.cpp 0
 
-Like the \c Musician type, the \c Instrument type has to be registered
-using qmlRegisterType() to be used from QML. As with \c Musician, we'll add the
-type to the "Music" module, version 1.0:
+
+Like the \c PieChart type, the \c PieSlice type has to be registered
+using qmlRegisterType() to be used from QML. As with \c PieChart, we'll add the
+type to the "Charts" module, version 1.0:
 
 \snippet declarative/tutorials/extending/chapter4-customPropertyTypes/main.cpp 0
 \dots
@@ -293,15 +340,65 @@ Try it out with the code in Qt's \c examples/tutorials/extending/chapter4-custom
 
 */
 
+
 /*!
-\title Chapter 5: Writing an Extension Plugin
+\title Chapter 5: Using List Property Types
 
-\example declarative/tutorials/extending/chapter5-plugins
+\example declarative/tutorials/extending/chapter5-listproperties
 
-Currently the \c Musician and \c Instrument types are used by \c app.qml,
+Right now, a \c PieChart can only have one \c PieSlice. Ideally a chart would
+have multiple slices, with different colors and sizes. To do this, we could
+have a \c slices property that accepts a list of \c PieSlice items:
+
+\snippet declarative/tutorials/extending/chapter5-listproperties/app.qml 0
+
+\image extending-tutorial-chapter5.png
+
+To do this, we replace the \c pieSlice property in \c PieChart with a \c slices property,
+declared as a QDeclarativeListProperty type. The QDeclarativeListProperty class enables the 
+creation of list properties in QML extensions. We replace the \c pieSlice()
+function with a \c slices() function that returns a list of slices, and add 
+an internal \c append_slice() function (discussed below). We also use a QList to 
+store the internal list of slices as \c m_slices:
+
+\snippet declarative/tutorials/extending/chapter5-listproperties/piechart.h 0
+\dots
+\snippet declarative/tutorials/extending/chapter5-listproperties/piechart.h 1
+\dots
+\snippet declarative/tutorials/extending/chapter5-listproperties/piechart.h 2
+
+Although the \c slices property does not have an associated \c WRITE function,
+it is still modifiable because of the way QDeclarativeListProperty works.
+In the \c PieChart implementation, we implement \c PieChart::slices() to
+return a QDeclarativeListProperty value and indicate that the internal
+\c PieChart::append_slice() function is to be called whenever a request is made from QML
+to add items to the list:
+
+\snippet declarative/tutorials/extending/chapter5-listproperties/piechart.cpp 0
+
+The \c append_slice() function simply sets the parent item as before,
+and adds the new item to the \c m_slices list. As you can see, the append function for a
+QDeclarativeListProperty is called with two arguments: the list property, and
+the item that is to be appended.
+
+The \c PieSlice class has also been modified to include \c fromAngle and \c angleSpan
+properties and to draw the slice according to these values. This is a straightforward
+modification if you have read the previous pages in this tutorial, so the code is not shown here.
+
+The complete code can be seen in the updated \c examples/tutorials/extending/chapter5-listproperties directory.
+
+*/
+
+
+/*!
+\title Chapter 6: Writing an Extension Plugin
+
+\example declarative/tutorials/extending/chapter6-plugins
+
+Currently the \c PieChart and \c PieSlice types are used by \c app.qml,
 which is displayed using a QDeclarativeView in a C++ application. An alternative
 way to use our QML extension is to create a plugin library to make it available
-to the QML engine. This means we could load \c app.qml using the \l {QML Viewer}
+to the QML engine. This allows \c app.qml to be loaded with the \l {QML Viewer}
 (or some other QML \l{Qt Declarative UI Runtime}{runtime} application) instead of writing a \c main.cpp file and
 loading our own C++ application.
 
@@ -313,28 +410,28 @@ To create a plugin library, we need:
 \o A "qmldir" file that tells the QML engine to load the plugin
 \endlist
 
-First, we create a plugin class named \c MusicPlugin. It subclasses QDeclarativeExtensionPlugin
+First, we create a plugin class named \c ChartsPlugin. It subclasses QDeclarativeExtensionPlugin
 and registers our QML types in the inherited \l{QDeclarativeExtensionPlugin::}{registerTypes()} method. It also calls
 Q_EXPORT_PLUGIN2 for Qt's \l{How to Create Qt Plugins}{plugin system}.
 
-Here is the \c MusicPlugin definition in \c musicplugin.h:
+Here is the \c ChartsPlugin definition in \c chartsplugin.h:
 
-\snippet declarative/tutorials/extending/chapter5-plugins/musicplugin.h 0
+\snippet declarative/tutorials/extending/chapter6-plugins/chartsplugin.h 0
 
-And its implementation in \c musicplugin.cpp:
+And its implementation in \c chartsplugin.cpp:
 
-\snippet declarative/tutorials/extending/chapter5-plugins/musicplugin.cpp 0
+\snippet declarative/tutorials/extending/chapter6-plugins/chartsplugin.cpp 0
 
 Then, we write a \c .pro project file that defines the project as a plugin library
 and specifies with DESTDIR that library files should be built into a "lib" subdirectory:
 
-\quotefile declarative/tutorials/extending/chapter5-plugins/chapter5-plugins.pro
+\quotefile declarative/tutorials/extending/chapter6-plugins/chapter6-plugins.pro
 
 Finally, we add a \c qmldir file that is automatically parsed by the QML engine.
-Here, we specify that a plugin named "chapter5-plugin" (the name
+Here, we specify that a plugin named "chapter6-plugin" (the name
 of the example project) can be found in the "lib" subdirectory:
 
-\quotefile declarative/tutorials/extending/chapter5-plugins/qmldir
+\quotefile declarative/tutorials/extending/chapter6-plugins/qmldir
 
 Now we have a plugin, and instead of having a main.cpp and an executable, we can build
 the project and then load the QML file in the \l {QML Viewer}:
@@ -345,15 +442,16 @@ the project and then load the QML file in the \l {QML Viewer}:
 
 (On Mac OS X, you can launch the "QMLViewer" application instead.)
 
-Notice the "import Music 1.0" statement has disappeared from \c app.qml. This is
+Notice the "import Charts 1.0" statement has disappeared from \c app.qml. This is
 because the \c qmldir file is in the same directory as \c app.qml: this is equivalent to
-having Musician.qml and Instrument.qml files inside the project directory, which could both
+having PieChart.qml and PieSlice.qml files inside the project directory, which could both
 be used by \c app.qml without import statements.
 */
 
+
 /*!
-\page qml-extending-tutorial6.html
-\title Chapter 6: In Summary
+\page qml-extending-tutorial7.html
+\title Chapter 7: In Summary
 
 In this tutorial, we've shown the basic steps for creating a QML extension:
 
@@ -362,47 +460,33 @@ In this tutorial, we've shown the basic steps for creating a QML extension:
 \o Add callable methods using Q_INVOKABLE or Qt slots, and connect to Qt signals with an \c onSignal syntax
 \o Add property bindings by defining \l{Qt's Property System}{NOTIFY} signals
 \o Define custom property types if the built-in types are not sufficient
+\o Define list property types using QDeclarativeListProperty
 \o Create a plugin library by defining a Qt plugin and writing a \c qmldir file
 \endlist
 
 
 The \l {Extending QML in C++} reference documentation shows other useful features that can be added to
-QML extensions. For example, we could use \l{Object and List Property Types}{list properties} to allow multiple instruments for a \c Musician:
-
-\code
-    Musician {
-        instruments: [
-            Instrument { type: "Guitar" }
-            Instrument { type: "Drums" }
-            Instrument { type: "Keyboard" }
-        ]
-    }
-\endcode
-
-Or use \l{Default Property}{default properties} and avoid an
-\c instruments property altogether:
+QML extensions. For example, we could use \l{Default Property}{default properties} to allow 
+slices to be added without using the \c slices property:
 
 \code
-    Musician {
-        Instrument { type: "Guitar" }
-        Instrument { type: "Drums" }
-        Instrument { type: "Keyboard" }
+    PieChart {
+        PieSlice { ... }
+        PieSlice { ... }
+        PieSlice { ... }
     }
 \endcode
 
-Or even change the \c instrument of a \c Musician from time to time using \l{Property Value Sources}{property value sources}:
+Or randomly add and remove slices from time to time using \l{Property Value Sources}{property value sources}:
 
 \code
-    Musician {
-        InstrumentRandomizer on instrument {}
+    PieChart {
+        PieSliceRandomizer on slices {}
     }
 \endcode
 
 
 See the \l{Extending QML in C++}{reference documentation} for more information.
 
-Additionally, \l {Integrating QML with existing Qt UI code} shows how to create
-and integrate with QML extensions that have drawing and graphical capabilities (through QGraphicsWidget).
-
 */
 
diff --git a/doc/src/declarative/pics/extending-tutorial-chapter1.png b/doc/src/declarative/pics/extending-tutorial-chapter1.png
new file mode 100644
index 0000000..9f5836b
--- /dev/null
+++ b/doc/src/declarative/pics/extending-tutorial-chapter1.png
diff --git a/doc/src/declarative/pics/extending-tutorial-chapter2.png b/doc/src/declarative/pics/extending-tutorial-chapter2.png
new file mode 100644
index 0000000..5c8f222
--- /dev/null
+++ b/doc/src/declarative/pics/extending-tutorial-chapter2.png
diff --git a/doc/src/declarative/pics/extending-tutorial-chapter3.png b/doc/src/declarative/pics/extending-tutorial-chapter3.png
new file mode 100644
index 0000000..825553f
--- /dev/null
+++ b/doc/src/declarative/pics/extending-tutorial-chapter3.png
diff --git a/doc/src/declarative/pics/extending-tutorial-chapter5.png b/doc/src/declarative/pics/extending-tutorial-chapter5.png
new file mode 100644
index 0000000..0c2e69e
--- /dev/null
+++ b/doc/src/declarative/pics/extending-tutorial-chapter5.png
diff --git a/doc/src/declarative/qdeclarativeintro.qdoc b/doc/src/declarative/qdeclarativeintro.qdoc
index 9126a79..3f1b184 100644
--- a/doc/src/declarative/qdeclarativeintro.qdoc
+++ b/doc/src/declarative/qdeclarativeintro.qdoc
@@ -314,7 +314,7 @@ Item {
 
 \section2 Signal Handlers
 
-Signal handlers allow actions to be taken in reponse to an event.  For instance,
+Signal handlers allow actions to be taken in response to an event.  For instance,
 the \l MouseArea element has signal handlers to handle mouse press, release
 and click:
 
diff --git a/doc/src/declarative/qdeclarativemodels.qdoc b/doc/src/declarative/qdeclarativemodels.qdoc
index b44e6f2..a2f4d3a 100644
--- a/doc/src/declarative/qdeclarativemodels.qdoc
+++ b/doc/src/declarative/qdeclarativemodels.qdoc
@@ -429,4 +429,77 @@ Rectangle {
 }
 \endcode
 
+\section1 Accessing Views and Models from Delegates
+
+You can access the view for which a delegate is used, and its
+properties, by using ListView.view in a delegate on a ListView, or
+GridView.view in a delegate on a GridView, etc. In particular, you can
+access the model and its properties by using ListView.view.model.
+
+This is useful when you want to use the same delegate for a number of
+views, for example, but you want decorations or other features to be
+different for each view, and you would like these different settings to
+be properties of each of the views. Similarly, it might be of interest
+to access or show some properties of the model.
+
+In the following example, the delegate shows the property \e{language}
+of the model, and the color of one of the fields depends on the
+property \e{fruit_color} of the view.
+
+\code
+Rectangle {
+     width: 200; height: 200
+
+    ListModel {
+        id: fruitModel
+        property string language: "en"
+        ListElement {
+            name: "Apple"
+            cost: 2.45
+        }
+        ListElement {
+            name: "Orange"
+            cost: 3.25
+        }
+        ListElement {
+            name: "Banana"
+            cost: 1.95
+        }
+    }
+
+    Component {
+        id: fruitDelegate
+        Row {
+                Text { text: " Fruit: " + name; color: ListView.view.fruit_color }
+                Text { text: " Cost: $" + cost }
+                Text { text: " Language: " + ListView.view.model.language }
+        }
+    }
+
+    ListView {
+        property color fruit_color: "green"
+        model: fruitModel
+        delegate: fruitDelegate
+        anchors.fill: parent
+    }
+}
+\endcode
+
+Another important case is when some action (e.g. mouse click) in the
+delegate should update data in the model. In this case you can define
+a function in the model, e.g.:
+
+\code
+        setData(int row, const QString & field_name, QVariant new_value),
+\endcode
+
+...and call it from the delegate using:
+
+\code
+        ListView.view.model.setData(index, field, value)
+\endcode
+
+...assuming that \e{field} holds the name of the field which should be
+updated, and that \e{value} holds the new value.
+
 */
diff --git a/doc/src/declarative/qdeclarativeperformance.qdoc b/doc/src/declarative/qdeclarativeperformance.qdoc
index 26c1e89..be8c029 100644
--- a/doc/src/declarative/qdeclarativeperformance.qdoc
+++ b/doc/src/declarative/qdeclarativeperformance.qdoc
@@ -115,4 +115,25 @@ provide an image that includes the frame and the shadow.
 Avoid running JavaScript during animation.  For example, running a complex
 JavaScript expression for each frame of an x property animation.
 
+\section1 Rendering
+
+Often using a different graphics system will give superior performance to the native
+graphics system (this is especially the case on X11). This can be configured using
+QApplication::setGraphicsSystem() or via the command line using the \c -graphicssystem
+switch.
+
+You can enable OpenGL acceleration using the \c opengl graphics system, or by setting a
+QGLWidget as the viewport of your QDeclarativeView.
+
+You may need to try various options to find what works the best for your application.
+For embedded X11-based devices one recommended combination is to use the raster graphics
+system with a QGLWidget for the viewport. While this doesn't guarantee the \bold fastest
+performance for all use-cases, it typically has \bold{consistently good} performance for
+all use-cases. In contrast, only using the raster paint engine may result in very good
+performance for parts of your application and very poor performance elsewhere.
+
+The QML Viewer uses the raster graphics system by default for X11 and OS X. It also
+includes a \c -opengl command line option which sets a QGLWidget as the viewport of the
+view. On OS X, a QGLWidget is always used.
+
 */
diff --git a/doc/src/declarative/qtprogrammers.qdoc b/doc/src/declarative/qtprogrammers.qdoc
index ae54d58..68d56bf 100644
--- a/doc/src/declarative/qtprogrammers.qdoc
+++ b/doc/src/declarative/qtprogrammers.qdoc
@@ -27,8 +27,6 @@
 
 /*!
 
-   INCOMPLETE
-
 \page qtprogrammers.html
 \target qtprogrammers
 \title QML for Qt programmers
@@ -146,4 +144,14 @@ transition from an arbitrary Text item, or characters within a Text item, so you
 item would need to be sufficiently flexible to allow such animation.
 
 \section1 QML Items Compared With QGraphicsWidgets
+
+The main difference between QML items and QGraphicsWidgets is how they are intended to be used. The technical implementation details are much the same, but in practice they are different because QML items are made for declarative and compositional use, and QGraphicsWidgets are made for imperative and more integrated use. Both QML items and QGraphicsWidgets inherit from QGraphicsObject, and can co-exist. The differences are in the layouting system and the interfacing with other components. Note that, as QGraphicsWidgets tend more to be all-in-one packages, the equivalent of a QGraphicsWidget may be many QML items composed across several QML files, but it can still be loaded and used as a single QGraphicsObject from C++.
+
+QGraphicsWidgets are usually designed to be laid out with QGraphicsLayouts. QML does not use QGraphicsLayouts, as the Qt layouts do not mix well with animated and fluid UIs, so the geometry interface is one of the main differences. When writing QML elements, you allow the designers to place their bounding rectangle using absolute geometry, bindings or anchors (all setup for you when you inherit QDeclarativeItem) and you do not use layouts or size hints. If size hints are appropriate, then place them in the QML documentation so that the designers know how to use the item best, but still have complete control over the look and feel.
+
+The other main difference is that QGraphicsWidgets tend to follow the widget model, in that they are a self-contained bundle of UI and logic. In contrast, QML primitives are usually a single purpose item that does not fulfill a use case on its own, but is composed into the equivalent of the widget inside the QML file. So when writing QML Items, try to avoid doing UI logic or composing visual elements inside the items. Try instead to write more general purpose primitives, so that the look and feel (which involves the UI logic) can be written in QML.
+
+Both differences are caused by the different method of interaction. QGraphicsWidget is a QGraphicsObject subclass which makes fluid UI development from C++ easier, and QDeclarativeItem is a QGraphicsObject subclass which makes fluid UI development from QML easier. The difference therefore is primarily one of the interface exposed, and the design of the items that come with it (the Declarative primitives for QML and the nothing for QGraphicsWidget, because you need to write your own UI logic into the subclass).
+
+If you wish to use both QML and C++ to write the UI, for example to ease the transition period, it is recommended to use QDeclarativeItem subclasses (although you can use QGraphicsWidgets as well). To allow for easier use from C++ make the root item of each C++ component a LayoutItem, and load individual 'widgets' of QML (possibly comprised of multiple files, and containing a self-contained bundle of UI and logic) into your scene to replace individual QGraphicsWidgets one at a time.
 */
diff --git a/doc/src/examples/movie.qdoc b/doc/src/examples/movie.qdoc
index 733f52d..4d7b3e0 100644
--- a/doc/src/examples/movie.qdoc
+++ b/doc/src/examples/movie.qdoc
@@ -30,8 +30,8 @@
     \title Movie Example
 
     The Movie example demonstrates how to use QMovie and QLabel to
-    display animations. Now that Qt comes with \l{Phonon
-    Overview}{Phonon} (the multimedia framework), QMovie is mostly
+    display animations. Now that Qt comes with the \l{Phonon multimedia
+    framework} {Phonon multimedia framework}, QMovie is mostly
     useful if one wants to play a simple animation without the added
     complexity of a multimedia framework to install and deploy.
 
diff --git a/doc/src/examples/trafficinfo.qdoc b/doc/src/examples/trafficinfo.qdoc
index fe69d52..bc06178 100644
--- a/doc/src/examples/trafficinfo.qdoc
+++ b/doc/src/examples/trafficinfo.qdoc
@@ -145,5 +145,5 @@
 
     The rest of the code in this example is just for representing the time and
     station information to the user, and uses techniques described in the
-    \l{Widgets Examples}.
+    \l{Widget Examples}.
 */
diff --git a/doc/src/frameworks-technologies/dnd.qdoc b/doc/src/frameworks-technologies/dnd.qdoc
index 4a1b631..c5dd27c 100644
--- a/doc/src/frameworks-technologies/dnd.qdoc
+++ b/doc/src/frameworks-technologies/dnd.qdoc
@@ -45,7 +45,7 @@
     outlines the approach used to enable it in custom widgets. Drag
     and drop operations are also supported by Qt's item views and by
     the graphics view framework. More information is available in
-    \l{Using Drag and Drop with Item Views} and \l{Graphics View
+    \l{Using drag & drop with item views} and \l{Graphics View
     Framework}.
 
     \section1 Drag and Drop Classes
diff --git a/doc/src/frameworks-technologies/model-view-programming.qdoc b/doc/src/frameworks-technologies/model-view-programming.qdoc
index 94b9f0d..131f063 100644
--- a/doc/src/frameworks-technologies/model-view-programming.qdoc
+++ b/doc/src/frameworks-technologies/model-view-programming.qdoc
@@ -900,7 +900,7 @@
     after its application through the use of certain types of selection
     commands. These are discussed later in this section.
 
-    \section3 Current item &amp selected items
+    \section3 Current item and selected items
 
     In a view, there is always a current item and a selected item - two
     independent states. An item can be the current item and selected at the
@@ -1257,7 +1257,7 @@
     reimplement the \l{QAbstractItemModel::columnCount()}{columnCount()}
     function.
 
-    \section3 Model headers &amp data
+    \section3 Model headers and data
 
     For items in the view, we want to return the strings in the string list.
     The \l{QAbstractItemModel::data()}{data()} function is responsible for
@@ -1350,7 +1350,7 @@
 
     \snippet doc/src/snippets/stringlistmodel/model.cpp 1
 
-    \section3 Inserting &amp removing rows
+    \section3 Inserting and removing rows
 
     It is possible to change the number of rows and columns in a model. In the
     string list model it only makes sense to change the number of rows, so we
@@ -1634,7 +1634,7 @@
     contain the text given in the search string. This pattern can also be
     used in the list and table widgets.
 
-    \section1 Using drag &amp drop with item views
+    \section1 Using drag & drop with item views
 
     Qt's drag and drop infrastructure is fully supported by the model/view framework.
     Items in lists, tables, and trees can be dragged within the views, and data can be
@@ -1714,7 +1714,7 @@
     of QAbstractItemModel::removeRows(), either directly or by inheriting the
     implementation from its base class.
 
-    \section3 Enabling drag &amp drop for items
+    \section3 Enabling drag & drop for items
 
     Models indicate to views which items can be dragged, and which will accept drops,
     by reimplementing the QAbstractItemModel::flags() function to provide suitable
@@ -2124,12 +2124,12 @@
     children may be displayed incorrectly in some views until the user
     attempts to view the non-existent child items.
 
-    \section2 Navigation &amp model index creation
+    \section2 Navigation and model index creation
 
     Hierarchical models need to provide functions that views can call to navigate the
     tree-like structures they expose, and obtain model indexes for items.
 
-    \section3 Parents &amp children
+    \section3 Parents and children
 
     Since the structure exposed to views is determined by the underlying data
     structure, it is up to each model subclass to create its own model indexes
@@ -2153,7 +2153,7 @@
     models to supply some unique identifier to this function to ensure that
     the model index can be re-associated with its corresponding item later on.
 
-    \section2 Drag &amp drop support and MIME type handling
+    \section2 Drag & drop support and MIME type handling
 
     The model/view classes support drag and drop operations, providing default behavior
     that is sufficient for many applications. However, it is also possible to customize
@@ -2282,7 +2282,7 @@
     \endlist
 
     For more information about drag and drop with item views, refer to
-    \l{Using Drag and Drop with Item Views}.
+    \l{Using drag & drop with item views}.
 
     \section3 Convenience views
 
@@ -2293,7 +2293,7 @@
     the existing contents with the data being transferred, the underlying model
     will set the data of the target items rather than insert new rows and columns
     into the model. For more information on drag and drop in convenience views,
-    you can see \l{Using Drag and Drop with Item Views}.
+    you can see \l{Using drag & drop with item views}.
 
     \section2 Performance optimization for large amounts of data
 
diff --git a/doc/src/frameworks-technologies/phonon.qdoc b/doc/src/frameworks-technologies/phonon.qdoc
index 023b4ce..5119638 100644
--- a/doc/src/frameworks-technologies/phonon.qdoc
+++ b/doc/src/frameworks-technologies/phonon.qdoc
@@ -34,6 +34,7 @@
 
     \tableofcontents
 
+    \target Phonon Overview
     \section1 Introduction
 
     Qt uses the Phonon multimedia framework to provide functionality
diff --git a/doc/src/getting-started/examples.qdoc b/doc/src/getting-started/examples.qdoc
index b6766d5..a32d120 100644
--- a/doc/src/getting-started/examples.qdoc
+++ b/doc/src/getting-started/examples.qdoc
@@ -343,8 +343,8 @@
 /*!
     \page examples-draganddrop.html
     \ingroup all-examples
-    \title Drag &amp Drop Examples
-    \brief How to access your platform's native darg &amp drop functionality
+    \title Drag & Drop Examples
+    \brief How to access your platform's native darg & drop functionality
 
     \image draganddrop-examples.png
 
diff --git a/doc/src/images/qml-mousearea-example.png b/doc/src/images/qml-mousearea-example.png
index c6e52d6..c0eef7f 100644
--- a/doc/src/images/qml-mousearea-example.png
+++ b/doc/src/images/qml-mousearea-example.png
diff --git a/doc/src/images/qml-xmllistmodel-example.png b/doc/src/images/qml-xmllistmodel-example.png
new file mode 100644
index 0000000..be2d15d
--- /dev/null
+++ b/doc/src/images/qml-xmllistmodel-example.png
diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc
index 18a1746..92721c5 100644
--- a/doc/src/index.qdoc
+++ b/doc/src/index.qdoc
@@ -44,7 +44,7 @@
                   <li><a href="installation.html">Installation &amp; first steps</a></li>
                   <li><a href="how-to-learn-qt.html">How to learn Qt</a></li>
                   <li><a href="tutorials.html">Tutorials</a></li>
-                  <li><a href="examples.html">Examples</a></li>
+                  <li><a href="all-examples.html">Examples</a></li>
                   <li><a href="qt4-7-intro.html">Whats new in Qt 4.7</a></li>
                 </ul>
               </div>
@@ -56,30 +56,29 @@
             <div class="indexboxcont indexboxbar ">
               <div class="sectionlist tricol">
                 <ul>
-                  <li><a href="classes.html">Class index</a></li>
-                  <li><a href="functions.html">Function index</a></li>
-                  <li><a href="modules.html">Modules</a></li>
-                  <li><a href="namespaces.html">Namespaces</a></li>
-		  <li><a href="qtglobal.html">Global stuff</a></li>
-		  <li><a href="qdeclarativeelements.html">QML elements</a></li>
+					<li><a href="classes.html">Class index</a></li>
+					<li><a href="functions.html">Function index</a></li>
+					<li><a href="modules.html">Modules</a></li>
+					<li><a href="namespaces.html">Namespaces</a></li>
+					<li><a href="qtglobal.html">Global Declarations</a></li>
                 </ul>
               </div>
               <div class="sectionlist  tricol">
                 <ul>
-		  <li><a href="qt-basic-concepts.html">Basic Qt Architecture</a></li>
-		  <li><a href="declarativeui.html">Device UI's &amp; Qt Quick</a></li>
-		  <li><a href="qt-gui-concepts.html">Desktop UI components</a></li>
-		  <li><a href="platform-specific.html">Platform-specific info</a></li>
-		  <li><a href="qt-graphics.html">Graphics, Painting &amp; Printing</a></li>
-                  <li><a href="qt-network.html">Input/Output &amp; networking</a></li>
+					<li><a href="qt-basic-concepts.html">Programming with Qt</a></li>
+					<li><a href="qt-basic-concepts.html">Qt Architecture</a></li>
+					<li><a href="developing-with-qt.html">Cross-platform &amp; Platform-specific Development</a></li>
+					<li><a href="technology-apis.html">Qt &amp; standard technologies </a></li>
+					<li><a href="best-practices.html">Qt How-to's &amp; best practices</a></li>
                 </ul>
               </div>
               <div class="sectionlist">
                 <ul>
-                  <li><a href="model-view-programming.html">Model/View programming</a></li>
-                  <li><a href="technology-apis.html">Qt API's for other technologies</a></li>
-                  <li><a href="best-practices.html">Qt How-to's &amp; best practices</a></li>
-                  <li><a href="developing-with-qt.html">Cross-platform development</a></li>
+					<li><a href="declarativeui.html">Qt Quick</a></li>
+					<li><a href="qdeclarativeintroduction.html">Introduction to QML</a></li>
+					<li><a href="qdeclarativeelements.html">QML Elements</a></li>
+					<li><a href="qt-gui-concepts.html">UI components</a></li>
+					<li><a href="declarativeui.html">Qt & GUI design</a></li>
                 </ul>
               </div>
             </div>
diff --git a/doc/src/platforms/symbian-introduction.qdoc b/doc/src/platforms/symbian-introduction.qdoc
index e5f0e62..701707e 100644
--- a/doc/src/platforms/symbian-introduction.qdoc
+++ b/doc/src/platforms/symbian-introduction.qdoc
@@ -51,6 +51,7 @@
         \o \l {Exception Safety with Symbian}
         \o \l {Platform Notes - Symbian} {Qt for the Symbian platform - state of support}
         \o \l {qmake Platform Notes#Symbian platform} {Qt for Symbian extensions for qmake}
+	\o \l {Symbian Platform Security Requirements} {Symbian Platform Security Requirements}
     \endlist
     \o
     \list
@@ -60,6 +61,22 @@
 */
 
 /*!
+    \page symbian-platform-security-requirements.html
+
+    \title Symbian Platform Security Requirements
+    \ingroup qtsymbian
+
+    On Symbian, processes that access media via the network must
+    have the \c NetworkServices platform security capability. If the client
+    process lacks this capability, operations will result in errors.
+    This failure is indicated by a state() of Phonon::ErrorState.
+
+    Platform security capabilities are added via the
+    \l{qmake-variable-reference.html#target-capability}{TARGET.CAPABILITY}
+    qmake variable.
+*/
+
+/*!
     \page symbian-with-qt-introduction.html
 
     \title The Symbian platform - Introduction to Qt
diff --git a/doc/src/snippets/code/doc_src_installation.qdoc b/doc/src/snippets/code/doc_src_installation.qdoc
index 985f3da..c46159c 100644
--- a/doc/src/snippets/code/doc_src_installation.qdoc
+++ b/doc/src/snippets/code/doc_src_installation.qdoc
@@ -263,7 +263,7 @@ make
 //! [40]
 
 //! [41]
-cd src/s60installs
+cd src
 make sis
 //! [41]
 
diff --git a/doc/src/snippets/declarative/mousearea.qml b/doc/src/snippets/declarative/mousearea.qml
index 8e7c737..fb6cba0 100644
--- a/doc/src/snippets/declarative/mousearea.qml
+++ b/doc/src/snippets/declarative/mousearea.qml
@@ -83,17 +83,18 @@ Rectangle {
     id: container
     width: 600; height: 200
 
-    Image {
-        id: pic
-        source: "pics/qt.png"
-        opacity: (600.0 - pic.x) / 600
+    Rectangle {
+        id: rect
+        width: 50; height: 50
+        color: "red"
+        opacity: (600.0 - rect.x) / 600
 
         MouseArea {
             anchors.fill: parent
-            drag.target: pic
+            drag.target: rect
             drag.axis: Drag.XAxis
             drag.minimumX: 0
-            drag.maximumX: container.width - pic.width
+            drag.maximumX: container.width - rect.width
         }
     }
 }
diff --git a/doc/src/template/style/OfflineStyle.css b/doc/src/template/style/OfflineStyle.css
index afa7de0..9f5d28b 100644
--- a/doc/src/template/style/OfflineStyle.css
+++ b/doc/src/template/style/OfflineStyle.css
@@ -1,588 +1,26 @@
 @media screen
 {
-    html
-    {
-        color: #000000;
-        background: #FFFFFF;
-    }
-    body, div, dl, dt, dd, ul, ol, li, h1, h2, h3, h4, h5, h6, pre, code, form, fieldset, legend, input, button, textarea, p, blockquote, th, td
-    {
-        margin: 0;
-        padding: 0;
-    }
-    table
-    {
-        border-collapse: collapse;
-        border-spacing: 0;
-    }
-    fieldset, img
-    {
-        border: 0;
-    }
-    address, caption, cite, code, dfn, em, strong, th, var, optgroup
-    {
-        font-style: inherit;
-        font-weight: inherit;
-    }
-    del, ins
-    {
-        text-decoration: none;
-    }
-    li
-    {
-        list-style: none;
-    }
-    caption, th
-    {
-        text-align: left;
-    }
-    h1, h2, h3, h4, h5, h6
-    {
-        font-size: 100%;
-    }
-    q:before, q:after
-    {
-        content: '';
-    }
-    abbr, acronym
-    {
-        border: 0;
-        font-variant: normal;
-    }
-    sup
-    {
-        vertical-align: baseline;
-    }
-    sub
-    {
-        vertical-align: baseline;
-    }
-	tt, .qmlreadonly span, .qmldefault span
-	{
-		word-spacing:5px;
-	}
-    .heading
-    {
-        font: normal 600 16px/1.0 Arial;
-    }
-    .subtitle
-    {
-        font-size: 13px;
-    }
-    .small-subtitle
-    {
-        font-size: 13px;
-    }
-    legend
-    {
-        color: #000000;
-    }
-    input, button, textarea, select, optgroup, option
-    {
-        font-family: inherit;
-        font-size: inherit;
-        font-style: inherit;
-        font-weight: inherit;
-    }
-    input, button, textarea, select
-    {
-        font-size: 100%;
-    }
-    body
-    {
-        font: normal 13px/1.2 Verdana;
-        color: #363534;
-    }
-    strong
-    {
-        font-weight: bold;
-    }
-    em
-    {
-        font-style: italic;
-    }
-    a
-    {
-        color: #00732f;
-        text-decoration: none;
-    }
-    .header, .footer, .wrapper
-    {
-        /*min-width: 600px;*/
-        max-width: 1500px;
-        margin: 0 5px;
-    }
+
     .wrapper
     {
-	position:relative;
 	top:50px;
+    background: none;
+
     }
     .wrapper .bd
     {
+        background: none;
         position: relative;
     }
 
-    .header, .footer
-    {
-        display: block;
-        clear: both;
-        overflow: hidden;
-    }
-    .header
-    {
-        height: 115px;
-        position: relative;
-    }
-    
-    
-    .header .qtref
-    {
-        position: absolute;
-        top: 28px;
-        left: 88px;
-        width: 302px;
-        height: 22px;
-    }
-    .header .qtref span
-    {
-        display: block;
-        height: 22px;
-    }
-    .wrap .content h1
-    {
-        font: 600 18px/1.2 Arial;
-    }
-    .wrap .content h2
-    {
-        font: 600 16px/1.2 Arial;
-    }
-    .wrap .content h3
-    {
-        font: 600 14px/1.2 Arial;
-    }
-    .wrap .content h4
-    {
-        font: 600 12px/1.2 Arial;
-    }
-	
-    .wrap .content p
-    {
-        line-height: 20px;
-        padding: 5px;
-    }
-    .wrap .content table p
-    {
-        line-height: 20px;
-        padding: 0px;
-    }	
-    .wrap .content ul
-    {
-        padding-left: 25px;
-        padding-top: 10px;
-    }
-    a:hover
-    {
-        color: #4c0033;
-        text-decoration: underline;
-    }
-    .content a:visited
-    {
-        color: #4c0033;
-        text-decoration: none;
-    }
-     .content a:visited:hover
-    {
-        color: #4c0033;
-        text-decoration: underline;
-    }   
-
-    pre
-    {
-        border: 1px solid #DDDDDD;
-        margin: 0 20px 10px 10px;
-        padding: 20px 15px 20px 20px;
-        overflow-x: auto;
-    }
-    table, pre
-    {
-        -moz-border-radius: 7px 7px 7px 7px;
-        background-color: #F6F6F6;
-        border: 1px solid #E6E6E6;
-        border-collapse: separate;
-        font-size: 11px;
-        /*min-width: 395px;*/
-        margin-bottom: 25px;
-        display: inline-block;
-    }
-    thead
-    {
-        margin-top: 5px;
-		font:600 12px/1.2 Arial;
-    }
-    th
-    {
-        padding: 5px 15px 5px 15px;
-        background-color: #E1E1E1;
-      /*  border-bottom: 1px solid #E6E6E6;*/
-        border-left: 1px solid #E6E6E6;
-      /*  border-right: 1px solid #E6E6E6;*/
-    }
-    td
-    {
-        padding: 3px 15px 3px 20px;
-  /*      border-left: 1px solid #E6E6E6;
-        border-right: 1px solid #E6E6E6;*/
-    }
-    tr.odd td:hover,  tr.even td:hover
-    {
-    /*    border-right: 1px solid #C3C3C3;
-        border-left: 1px solid #C3C3C3;*/
-    }
-		
-	td.rightAlign
-	{
-        padding: 3px 15px 3px 10px;
-	}
-    table tr.odd
-    {
-        border-left: 1px solid #E6E6E6;
-        background-color: #F6F6F6;
-        color: #66666E;
-    }
-    table tr.even
-    {
-        border-left: 1px solid #E6E6E6;
-        background-color: #ffffff;
-        color: #66666E;
-    }
-    table tr.odd td:hover, table tr.even td:hover
-    {
-        background-color: #E6E6E6;
-    }
-    		
-    span.comment
-    {
-        color: #8B0000;
-        font-style: italic;
-    }
-    span.string, span.char
-    {
-        color: #254117;
-    }
-
-    .qmltype
-    {
-        text-align: center;
-        font-size: 160%;
-    }
-    .qmlreadonly
-    {
-        float: right;
-        color: #254117;
-    }
-
-    .qmldefault
-    {
-        float: right;
-        color: red;
-    }
-
-	.footer
-    {
-		border-top:1px solid #E5E5E5;
-        min-height: 100px;
-        color: #797775;
-        font: normal 9px/1 Verdana;
-        text-align: center;
-        padding-top: 40px;
-        margin: 0;
-    }
 
     
-     .wrap
-    {
-        margin: 0 5px 0 5px;
-    }
-    .wrap .toolbar
-    {
-     display:block;
-    }
-
-    .wrap .breadcrumb ul li
-    {
-        float: left;
-        background: url(../images/breadcrumb.png) no-repeat 0 5px;
-        padding-left: 15px;
-        margin-left: 15px;
-        font-weight: bold;
-    }
-    .wrap .breadcrumb ul li.last
-    {
-        font-weight: normal;
-    }
-    .wrap .breadcrumb ul li a
-    {
-      /*  color: #363534;*/
-        color: #00732F;
-    }
-    .wrap .breadcrumb ul li.first
-    {
-        background-image: none;
-        padding-left: 0;
-        margin-left: 0;
-    }
-    .wrap .content
-    {
-		word-wrap:break-word;
-    }
-    .wrap .content li
-    {
-        /*padding-left: 12px;*/
-        background: url(../images/bullet_sq.png) no-repeat 0 5px;
-        font: normal 400 10pt/1 Verdana;
-       /* color: #44a51c;*/
-        margin-bottom: 10px; 
-    }
-
-    .offline .wrap .content
-    {
-        padding-top: 15px;
-    }
-
-    .header:after, .footer:after, .breadcrumb:after, .wrap .content:after, .group:after
-    {
-        content: ".";
-        display: block;
-        height: 0;
-        clear: both;
-        visibility: hidden;
-    }
-    
-    hr
-    {
-        background-color: #E6E6E6;
-        border: 1px solid #E6E6E6;
-        height: 1px;
-        width: 100%;
-        text-align: left;
-        margin: 5px 0px 5px 0px;
-    }
-
-    .content .alignedsummary
-    {
-        margin: 5px;
-		width:100%;
-    }
-
-     
-    .toc
-    {
-        float: right;
-        -moz-border-radius: 7px 7px 7px 7px;
-        background-color: #F6F6F6;
-        border: 1px solid #DDDDDD;
-        margin: 0 20px 10px 10px;
-        padding: 20px 15px 20px 20px;
-        height: auto;
-        width: 200px;
-    }
-
-    .toc h3, .generic a
-    {
-        font: 600 12px/1.2 Arial;
-    }
-
-    .wrap .content .toc ul
-    {
-        padding-left: 0px;
-    }
-
-
-    .wrap .content .toc .level2
-    {
-        margin-left: 15px;
-    }
-
-    .wrap .content .toc .level3
-    {
-        margin-left: 30px;
-    }
-
-    .content .toc li
-    {
-        font: normal 10px/1.2 Verdana;
-        background: url(../images/bullet_dn.png) no-repeat 0 5px;
-    }
-	
-	
-	.generic{
-		max-width:75%;
-	}
-	.generic td{
-		padding:0;
-	}
-	
-	.generic .odd .alphaChar{
-        background-color: #F6F6F6;
-	}
-	
-	.generic .even .alphaChar{
-        background-color: #FFFFFF;
-	}
-
-	.highlightedCode
-	{
-	margin:10px;
-	}
-
-	.flowList{
-	vertical-align:top;
-	}	
-	.alphaChar{
-	width:100%;
-	background-color:#F6F6F6;
-	border:1px solid #E6E6E6;
-	font-size:12pt;
-	padding-left:10px;
-	margin-top:10px;
-	margin-bottom:10px;
-	}
-
-	.flowList dl{
-	}
-	.flowList dd{
-	display:inline-block;
-	margin-left:10px;
-	width:250px;
-	}
-	.wrap .content .flowList p{
-	padding:0px;
-	}
-	
-    .relpage
-    {
-        -moz-border-radius: 7px 7px 7px 7px;
-        border: 1px solid #DDDDDD;
-        padding: 25px 25px;
-        clear: both;
-    }
-    .relpage ul
-    {
-        float: none;
-        padding: 15px;
-    }
-    .content .relpage li
-    {
-        font: normal 11px/1.2 Verdana;
-    }
-    h3.fn, span.fn
-    {
-        background-color: #F6F6F6;
-        border-width: 1px;
-        border-style: solid;
-        border-color: #E6E6E6;
-        font-weight: bold;
-		word-spacing:3px;
-    }
-
-	.functionIndex {
-	font-size:12pt;
-	word-spacing:10px;
-	margin-bottom:10px;
-    background-color: #F6F6F6;
-    border-width: 1px;
-    border-style: solid;
-    border-color: #E6E6E6;
-	width:100%;
-	}
-	
-	.centerAlign {	text-align:center;}
-	.rightAlign {text-align:right;}
-	.leftAlign {text-align:left;}
-	.topAlign{vertical-align:top	}
-	.functionIndex a{display:inline-block;}
-
-    /* start index box */
-    .indexbox
-    {
-        width: 100%;
-		display:inline-block;
-    }
-
-    .indexboxcont { display: block; }
-
-    .indexboxbar
-    {
-		border-bottom:1px solid #E5E5E5;
-        margin-bottom: 25px;
-    }
-
-    .indexboxcont .section
-    {
-        display: inline-block;
-        padding:0 2% 0 1%;
-        vertical-align:top;
-	}
-
-	.indexboxcont .section {
-	  float: left;
-	}
-
-    .indexboxcont .section p
-    {
-        padding-top: 20px;
-        padding-bottom: 20px;
-    }
-    .indexboxcont .sectionlist
-    {
-        display: inline-block;
-		vertical-align:top;
-        padding: 0;
-    }
-    .indexboxcont .sectionlist ul
-    {
-        margin-bottom: 20px;
-    }
-
-    .indexboxcont .sectionlist ul li
-    {
-        line-height: 12px;
-    }
-
-    .content .indexboxcont li
-    {
-        font: normal 600 13px/1 Verdana;
-    }
-
-    .indexbox a:hover, .indexbox a:visited:hover
-    {
-        color: #4c0033;
-        text-decoration: underline;
-    }
-
-    .indexbox a:visited
-    {
-        color: #00732f;
-        text-decoration: none;
-    }
-	
-	.indexbox .indexIcon {
-	width: 11%;
-	}
-	
-   
-    .indexboxcont:after
-    {
-        content: ".";
-        display: block;
-        height: 0;
-        clear: both;
-        visibility: hidden;
-    }
-	
+ 
     body.offline
     {
       background-image: none;
+      background-color: #FFFFFF;
+	  
     }
 
     .offline .footer {
@@ -811,22 +249,3 @@ ul.sf-menu li li li.sfHover ul {
 }
 /* end of screen media */
 
-/* start of print media */
-
-@media print
-{
-     input, textarea, .header, .footer, .toolbar, .feedback, .wrapper .hd, .wrapper .bd .sidebar, .wrapper .ft
-    {
-        display: none;
-        background: none;
-    }
-    .content
-    {
-        position: absolute;
-        top: 0px;
-        left: 0px;
-        background: none;
-        display: block;
-    }
-}
-/* end of print media */
diff --git a/doc/src/template/style/style.css b/doc/src/template/style/style.css
index 184a832..9f80921 100755
--- a/doc/src/template/style/style.css
+++ b/doc/src/template/style/style.css
@@ -1,6 +1,8 @@
 @media screen
 {
-    html
+ 
+/* basic elements */
+ html
     {
         color: #000000;
         background: #FFFFFF;
@@ -18,8 +20,7 @@
     fieldset, img
     {
         border: 0;
-		height:100%;
-		width:100%
+		max-width:100%;
     }
     address, caption, cite, code, dfn, em, strong, th, var, optgroup
     {
@@ -41,7 +42,6 @@
     h1, h2, h3, h4, h5, h6
     {
         font-size: 100%;
-/*        font-weight: normal; */
     }
     q:before, q:after
     {
@@ -52,11 +52,7 @@
         border: 0;
         font-variant: normal;
     }
-    sup
-    {
-        vertical-align: baseline;
-    }
-    sub
+    sup, sub
     {
         vertical-align: baseline;
     }
@@ -64,19 +60,6 @@
 	{
 		word-spacing:5px;
 	}
-    .heading
-    {
-        font: normal 600 16px/1.0 Arial;
-        padding-bottom: 15px;
-    }
-    .subtitle
-    {
-        font-size: 13px;
-    }
-    .small-subtitle
-    {
-        font-size: 13px;
-    }
     legend
     {
         color: #000000;
@@ -92,9 +75,19 @@
     {
         font-size: 100%;
     }
+    strong
+    {
+        font-weight: bold;
+    }
+    em
+    {
+        font-style: italic;
+    }
+
+	/* adding Qt theme */	
     html
     {
-        background-color: #e5e5e5;
+      /*  background-color: #e5e5e5;*/
     }
     body
     {
@@ -102,73 +95,115 @@
         font: normal 13px/1.2 Verdana;
         color: #363534;
     }
-    strong
+    a
     {
-        font-weight: bold;
+        color: #00732f;
+        text-decoration: none;
     }
-    em
+    hr
     {
-        font-style: italic;
+        background-color: #E6E6E6;
+        border: 1px solid #E6E6E6;
+        height: 1px;
+        width: 100%;
+        text-align: left;
+        margin: 15px 0px 15px 0px;
     }
-    a
+
+    pre
     {
-        color: #00732f;
-        text-decoration: none;
+        border: 1px solid #DDDDDD;
+		-moz-border-radius: 7px 7px 7px 7px;
+        margin: 0 20px 10px 10px;
+        padding: 20px 15px 20px 20px;
+        overflow-x: auto;
     }
-    .header, .footer, .wrapper
+    table, pre
     {
-        min-width: 600px;
-        max-width: 1500px;
-        margin: 0 30px;
+        -moz-border-radius: 7px 7px 7px 7px;
+        background-color: #F6F6F6;
+        border: 1px solid #E6E6E6;
+        border-collapse: separate;
+        font-size: 11px;
+        margin-bottom: 25px;
     }
-    .wrapper
+	pre.highlightedCode {
+		display: block;
+		overflow:hidden;
+	}	
+    thead
     {
-        background: url(../images/bg_r.png) repeat-y 100% 0;
+        margin-top: 5px;
+		font:600 12px/1.2 Arial;
     }
-    .wrapper .hd
+    th
     {
-        padding-left: 216px;
-        height: 15px;
-        background: url(../images/page.png) no-repeat 0 0;
-        overflow: hidden;
+        padding: 5px 15px 5px 15px;
+        background-color: #E1E1E1;
+        border-left: 1px solid #E6E6E6;
     }
-    .offline .wrapper .hd
+    td
     {
-        background: url(../images/page.png) no-repeat 0 -15px;
+        padding: 3px 15px 3px 20px;
     }
-    .wrapper .hd span
+    tr.odd td:hover,  tr.even td:hover    {}
+		
+	td.rightAlign
+	{
+        padding: 3px 5px 3px 10px;
+	}
+    table tr.odd
     {
-        height: 15px;
-        display: block;
-        overflow: hidden;
-        background: url(../images/page.png) no-repeat 100% -30px;
+        border-left: 1px solid #E6E6E6;
+        background-color: #F6F6F6;
+        color: #66666E;
     }
-    .wrapper .bd
+    table tr.even
     {
-        background: url(../images/bg_l.png) repeat-y 0 0;
-        position: relative;
+        border-left: 1px solid #E6E6E6;
+        background-color: #ffffff;
+        color: #66666E;
     }
-    .offline .wrapper .bd
+    table tr.odd td:hover, table tr.even td:hover
     {
-        background: url(../images/bg_l_blank.png) repeat-y 0 0;
+     /*   background-color: #E6E6E6;*/ /* disabled until further notice */
     }
-    .wrapper .ft
+    		
+    span.comment
     {
-        padding-left: 216px;
-        height: 15px;
-        background: url(../images/page.png) no-repeat 0 -75px;
-        overflow: hidden;
+        color: #8B0000;
+        font-style: italic;
     }
-    .offline .wrapper .ft
+    span.string, span.char
     {
-        background: url(../images/page.png) no-repeat 0 -90px;
+        color: #254117;
     }
-    .wrapper .ft span
+
+
+/* end basic elements */
+
+/* font style elements */
+    .heading
     {
-        height: 15px;
-        display: block;
-        background: url(../images/page.png) no-repeat 100% -60px;
-        overflow: hidden;
+        font: normal bold 16px/1.0 Arial;
+        padding-bottom: 15px;
+    }
+    .subtitle
+    {
+        font-size: 13px;
+    }
+    .small-subtitle
+    {
+        font-size: 13px;
+    }
+/* end font style elements */
+
+/* global settings*/
+    .header, .footer, .wrapper
+    {
+        min-width: 600px;
+        max-width: 1500px;
+        margin: 0 30px;
     }
     .header, .footer
     {
@@ -176,6 +211,17 @@
         clear: both;
         overflow: hidden;
     }
+    .header:after, .footer:after, .breadcrumb:after, .wrap .content:after, .group:after
+    {
+        content: ".";
+        display: block;
+        height: 0;
+        clear: both;
+        visibility: hidden;
+    }
+	
+/* end global settings*/
+/* header elements */
     .header
     {
         height: 115px;
@@ -203,7 +249,247 @@
         text-indent: -999em;
         background: url(../images/sprites-combined.png) no-repeat -78px -235px;
     }
+    .content a:visited
+    {
+        color: #4c0033;
+        text-decoration: none;
+    }
+     .content a:visited:hover
+    {
+        color: #4c0033;
+        text-decoration: underline;
+    }
+	
+    #nav-topright
+    {
+        height: 70px;
+    }
+
+    #nav-topright ul
+    {
+        list-style-type: none;
+        float: right;
+        width: 370px;
+        margin-top: 11px;
+    }
+
+    #nav-topright li
+    {
+        display: inline-block;
+        margin-right: 20px;
+        float: left;
+    }
+
+    #nav-topright li.nav-topright-last
+    {
+        margin-right: 0;
+    }
+
+    #nav-topright li a
+    {
+        background: transparent url(../images/sprites-combined.png) no-repeat;
+        height: 18px;
+        display: block;
+        overflow: hidden;
+        text-indent: -9999px;
+    }
+
+    #nav-topright li.nav-topright-home a
+    {
+        width: 65px;
+        background-position: -2px -91px;
+    }
+
+    #nav-topright li.nav-topright-home a:hover
+    {
+        background-position: -2px -117px;
+    }
+
+
+    #nav-topright li.nav-topright-dev a
+    {
+        width: 30px;
+        background-position: -76px -91px;
+    }
+
+    #nav-topright li.nav-topright-dev a:hover
+    {
+        background-position: -76px -117px;
+    }
+
+
+    #nav-topright li.nav-topright-labs a
+    {
+        width: 40px;
+        background-position: -114px -91px;
+    }
+
+    #nav-topright li.nav-topright-labs a:hover
+    {
+        background-position: -114px -117px;
+    }
+
+    #nav-topright li.nav-topright-doc a
+    {
+        width: 32px;
+        background-position: -162px -91px;
+    }
+
+    #nav-topright li.nav-topright-doc a:hover, #nav-topright li.nav-topright-doc-active a
+    {
+        background-position: -162px -117px;
+    }
+
+    #nav-topright li.nav-topright-blog a
+    {
+        width: 40px;
+        background-position: -203px -91px;
+    }
+
+    #nav-topright li.nav-topright-blog a:hover, #nav-topright li.nav-topright-blog-active a
+    {
+        background-position: -203px -117px;
+    }
+
+    #nav-topright li.nav-topright-shop a
+    {
+        width: 40px;
+        background-position: -252px -91px;
+    }
+
+    #nav-topright li.nav-topright-shop a:hover, #nav-topright li.nav-topright-shop-active a
+    {
+        background-position: -252px -117px;
+    }
+
+    #nav-logo
+    {
+        background: transparent url(../images/sprites-combined.png ) no-repeat 0 -225px;
+        left: -3px;
+        position: absolute;
+        width: 75px;
+        height: 75px;
+        top: 13px;
+    }
+    #nav-logo a
+    {
+        width: 75px;
+        height: 75px;
+        display: block;
+        text-indent: -9999px;
+        overflow: hidden;
+    }
+
+
+    .shortCut-topleft-inactive
+    {
+        padding-left: 3px;
+        background: transparent url( ../images/sprites-combined.png) no-repeat 0px -58px;
+        height: 20px;
+        width: 47px;
+    }
+    .shortCut-topleft-inactive span
+    {
+        font-variant: normal;
+    }
+	    .shortCut-topleft-inactive span a:hover,     .shortCut-topleft-active a:hover
+	{
+		text-decoration:none;
+	}
+    #shortCut
+    {
+        padding-top: 10px;
+        font-weight: bolder;
+        color: #b0adab;
+    }
+    #shortCut ul
+    {
+        list-style-type: none;
+        float: left;
+        width: 347px;
+        margin-left: 100px;
+    }
+    #shortCut li
+    {
+        display: inline-block;
+        margin-right: 25px;
+        float: left;
+        white-space: nowrap;
+    }
+    #shortCut li a
+    {
+        color: #b0adab;
+    }
+    #shortCut li a:hover
+    {
+        color: #44a51c;
+    }
+
+	
+	
+/* end header elements */	
+/* content and sidebar elements */
+    .wrapper
+    {
+        background: url(../images/bg_r.png) repeat-y 100% 0;
+    }
+    .wrapper .hd
+    {
+        padding-left: 216px;
+        height: 15px;
+        background: url(../images/page.png) no-repeat 0 0;
+        overflow: hidden;
+    }
+
+
+
+
+    .wrapper .hd span
+    {
+        height: 15px;
+        display: block;
+        overflow: hidden;
+        background: url(../images/page.png) no-repeat 100% -30px;
+    }
+    .wrapper .bd
+    {
+        background: url(../images/bg_l.png) repeat-y 0 0;
+        position: relative;
+    }
+
+
+
+
+    .wrapper .ft
+    {
+        padding-left: 216px;
+        height: 15px;
+        background: url(../images/page.png) no-repeat 0 -75px;
+        overflow: hidden;
+    }
+
+
+
+
+    .wrapper .ft span
+    {
+        height: 15px;
+        display: block;
+        background: url(../images/page.png) no-repeat 100% -60px;
+        overflow: hidden;
+    }
+	.navTop{ 
+	float:right;
+	display:block;
+	padding-right:15px;
+
 
+	}
+	
+
+	
+/* end content and sidebar elements */	
+/* sidebar elements */
     .sidebar
     {
         float: left;
@@ -212,10 +498,10 @@
         font-size: 11px;
     }
 
-    .offline .sidebar, .offline .feedback, .offline .t_button
-    {
-        display: none;
-    }
+
+
+
+
 
     .sidebar .searchlabel
     {
@@ -258,9 +544,8 @@
 
     .sidebar .box h2
     {
-        font: 600 16px/1.2 Arial;
+        font: bold 16px/1.2 Arial;
         padding: 0;
-/*        min-height: 32px;*/
     }
     .sidebar .box h2 span
     {
@@ -273,10 +558,6 @@
     }
     .sidebar #lookup.box h2 span
     {
-/*        background: url(../images/sprites-combined.png) no-repeat -6px -311px;
-        width: 27px;
-        height: 35px;
-        margin-right: 13px;*/
     }
     .sidebar .box#topics h2
     {
@@ -284,10 +565,6 @@
     }
     .sidebar #topics.box h2 span
     {
-    /*    background: url(../images/sprites-combined.png) no-repeat -94px -311px;
-        width: 27px;
-        height: 32px;
-        margin-right: 13px;*/
     }
     .sidebar .box#examples h2
     {
@@ -295,10 +572,6 @@
     }
     .sidebar #examples.box h2 span
     {
-    /*    background: url(../images/sprites-combined.png) no-repeat -48px -311px;
-        width: 30px;
-        height: 31px;
-        margin-right: 9px;*/
     }
 
     .sidebar .box .list
@@ -315,7 +588,6 @@
     }
     .sidebar .box ul
     {
-	/*padding:10px;*/
 	padding-bottom:5px;
 	padding-left:10px;
 	padding-top:5px;
@@ -342,16 +614,40 @@
 		color:#AAD2F0;
 		font-style:italic;
     }	
+	.sidebar .search form input.loading
+	{
+			background:url("../images/spinner.gif") no-repeat scroll right center transparent;
+	}
 
+.floatingResult{
+	z-index:1;
+	position:relative;
+	padding-top:0px;
+	background-color:white;
+	border:solid 1px black;
+	height:250px;
+	width:600px;
+	overflow-x:hidden;
+	overflow-y:auto;
+}
+
+	.floatingResult:hover{
+		display:block;
+	}
+	.floatingResult:hover{
+	}
+	
+/* end sidebar elements */
+/* content elements */
     .wrap
     {
         margin: 0 5px 0 208px;
         overflow: visible; 
     }
-    .offline .wrap
-    {
-        margin: 0 5px 0 5px;
-    }
+
+
+
+
     .wrap .toolbar
     {
         background-color: #fafafa;
@@ -437,8 +733,11 @@
         color: #00732F;
     }
 
-    .offline .wrap .breadcrumb
+
+    .wrap .content
     {
+        padding: 30px;
+		word-wrap:break-word;
     }
 
     .wrap .breadcrumb ul
@@ -466,48 +765,51 @@
         padding-left: 0;
         margin-left: 0;
     }
-    .wrap .content
-    {
-        padding: 30px;
-		word-wrap:break-word;
-    }
 
+
+
+
+	.wrap .content ol li {
+	background:none;
+	font:normal 10pt/1 Verdana;
+
+	margin-bottom:10px;
+	margin-left:12px;
+	/*list-style-type:disc;*/
+	}
+	
     .wrap .content li
     {
-        /*padding-left: 12px;*/
         background: url(../images/bullet_sq.png) no-repeat 0 5px;
         font: normal 400 10pt/1 Verdana;
-       /* color: #44a51c;*/
         margin-bottom: 10px; 
 		padding-left:12px;
     }
-    .content li:hover
-    {
-      /*  text-decoration: underline;*/
-    }
 
-    .offline .wrap .content
-    {
-        padding-top: 15px;
-    }
+
+
+
+
+
+
+
+
+    .content li:hover  {}
 
     .wrap .content h1
     {
-        font: 600 18px/1.2 Arial;
+        font: bold 18px/1.2 Arial;
     }
     .wrap .content h2
     {
-    
 	border-bottom:1px solid #DDDDDD;
 	font:600 16px/1.2 Arial;
 	margin-top:15px;
-	width:100%;
-		
+	width:100%;	
     }
     .wrap .content h3
     {
-        font: 600 14px/1.2 Arial;
-		/*border-bottom:1px solid #DDDDDD;*/
+        font: bold 14px/1.2 Arial;
 		font:600 16px/1.2 Arial;
 		margin-top:15px;
 		width:100%;		
@@ -516,7 +818,6 @@
     {
         line-height: 20px;
         padding: 5px;
-	/*	text-align:justify;*/
     }
     .wrap .content table p
     {
@@ -533,25 +834,6 @@
         color: #4c0033;
         text-decoration: underline;
     }
-    .content a:visited
-    {
-        color: #4c0033;
-        text-decoration: none;
-    }
-     .content a:visited:hover
-    {
-        color: #4c0033;
-        text-decoration: underline;
-    }   .footer
-    {
-        min-height: 100px;
-        color: #797775;
-        font: normal 9px/1 Verdana;
-        text-align: center;
-        padding-top: 40px;
-        background-color: #E6E7E8;
-        margin: 0;
-    }
     .feedback
     {
         float: none;
@@ -568,267 +850,36 @@
         color: #00732F;
         text-decoration: underline;
     }
-    .header:after, .footer:after, .breadcrumb:after, .wrap .content:after, .group:after
-    {
-        content: ".";
-        display: block;
-        height: 0;
-        clear: both;
-        visibility: hidden;
-    }
-    #nav-topright
-    {
-        height: 70px;
-    }
-
-    #nav-topright ul
-    {
-        list-style-type: none;
-        float: right;
-        width: 370px;
-        margin-top: 11px;
-    }
-
-    #nav-topright li
-    {
-        display: inline-block;
-        margin-right: 20px;
-        float: left;
-    }
-
-    #nav-topright li.nav-topright-last
-    {
-        margin-right: 0;
-    }
-
-    #nav-topright li a
-    {
-        background: transparent url(../images/sprites-combined.png) no-repeat;
-        height: 18px;
-        display: block;
-        overflow: hidden;
-        text-indent: -9999px;
-    }
-
-    #nav-topright li.nav-topright-home a
-    {
-        width: 65px;
-        background-position: -2px -91px;
-    }
-
-    #nav-topright li.nav-topright-home a:hover
-    {
-        background-position: -2px -117px;
-    }
-
-
-    #nav-topright li.nav-topright-dev a
-    {
-        width: 30px;
-        background-position: -76px -91px;
-    }
-
-    #nav-topright li.nav-topright-dev a:hover
-    {
-        background-position: -76px -117px;
-    }
-
-
-    #nav-topright li.nav-topright-labs a
-    {
-        width: 40px;
-        background-position: -114px -91px;
-    }
-
-    #nav-topright li.nav-topright-labs a:hover
-    {
-        background-position: -114px -117px;
-    }
-
-    #nav-topright li.nav-topright-doc a
-    {
-        width: 32px;
-        background-position: -162px -91px;
-    }
-
-    #nav-topright li.nav-topright-doc a:hover, #nav-topright li.nav-topright-doc-active a
-    {
-        background-position: -162px -117px;
-    }
-
-    #nav-topright li.nav-topright-blog a
-    {
-        width: 40px;
-        background-position: -203px -91px;
-    }
-
-    #nav-topright li.nav-topright-blog a:hover, #nav-topright li.nav-topright-blog-active a
-    {
-        background-position: -203px -117px;
-    }
-
-    #nav-topright li.nav-topright-shop a
-    {
-        width: 40px;
-        background-position: -252px -91px;
-    }
-
-    #nav-topright li.nav-topright-shop a:hover, #nav-topright li.nav-topright-shop-active a
-    {
-        background-position: -252px -117px;
-    }
-
-    #nav-logo
-    {
-        background: transparent url(../images/sprites-combined.png ) no-repeat 0 -225px;
-        left: -3px;
-        position: absolute;
-        width: 75px;
-        height: 75px;
-        top: 13px;
-    }
-    #nav-logo a
-    {
-        width: 75px;
-        height: 75px;
-        display: block;
-        text-indent: -9999px;
-        overflow: hidden;
-    }
-
-
-    .shortCut-topleft-inactive
-    {
-        padding-left: 3px;
-        background: transparent url( ../images/sprites-combined.png) no-repeat 0px -58px;
-        height: 20px;
-        width: 47px;
-    }
-    .shortCut-topleft-inactive span
-    {
-        font-variant: normal;
-    }
-	    .shortCut-topleft-inactive span a:hover,     .shortCut-topleft-active a:hover
-	{
-		text-decoration:none;
+	.alphaChar{
+	width:100%;
+	background-color:#F6F6F6;
+	border:1px solid #E6E6E6;
+	-moz-border-radius: 7px 7px 7px 7px;
+	font-size:12pt;
+	padding-left:10px;
+	margin-top:10px;
+	margin-bottom:10px;
 	}
-    #shortCut
-    {
-        padding-top: 10px;
-        font-weight: bolder;
-        color: #b0adab;
-    }
-    #shortCut ul
-    {
-        list-style-type: none;
-        float: left;
-        width: 347px;
-        margin-left: 100px;
-    }
-    #shortCut li
-    {
-        display: inline-block;
-        margin-right: 25px;
-        float: left;
-        white-space: nowrap;
-    }
-    #shortCut li a
-    {
-        color: #b0adab;
-    }
-    #shortCut li a:hover
-    {
-        color: #44a51c;
-    }
+	.flowList{
+	vertical-align:top;
+	}	
 
-    hr
-    {
-        background-color: #E6E6E6;
-        border: 1px solid #E6E6E6;
-        height: 1px;
-        width: 100%;
-        text-align: left;
-        margin: 15px 0px 15px 0px;
-    }
+	.flowList dl{
+	}
+	.flowList dd{
+	display:inline-block;
+	margin-left:10px;
+	width:250px;
+	}
+	.wrap .content .flowList p{
+	padding:0px;
+	}
 
     .content .alignedsummary
     {
         margin: 15px;
     }
-    pre
-    {
-        border: 1px solid #DDDDDD;
-		-moz-border-radius: 7px 7px 7px 7px;
-        margin: 0 20px 10px 10px;
-        padding: 20px 15px 20px 20px;
-        overflow-x: auto;
-    }
-    table, pre
-    {
-        -moz-border-radius: 7px 7px 7px 7px;
-        background-color: #F6F6F6;
-        border: 1px solid #E6E6E6;
-        border-collapse: separate;
-        font-size: 11px;
-        /*min-width: 395px;*/
-        margin-bottom: 25px;
-     /*   display: inline-block;*/
-    }
-    thead
-    {
-        margin-top: 5px;
-		font:600 12px/1.2 Arial;
-    }
-    th
-    {
-        padding: 5px 15px 5px 15px;
-        background-color: #E1E1E1;
-      /*  border-bottom: 1px solid #E6E6E6;*/
-        border-left: 1px solid #E6E6E6;
-      /*  border-right: 1px solid #E6E6E6;*/
-    }
-    td
-    {
-        padding: 3px 15px 3px 20px;
-  /*      border-left: 1px solid #E6E6E6;
-        border-right: 1px solid #E6E6E6;*/
-    }
-    tr.odd td:hover,  tr.even td:hover
-    {
-    /*    border-right: 1px solid #C3C3C3;
-        border-left: 1px solid #C3C3C3;*/
-    }
-		
-	td.rightAlign
-	{
-        padding: 3px 5px 3px 10px;
-	}
-    table tr.odd
-    {
-        border-left: 1px solid #E6E6E6;
-        background-color: #F6F6F6;
-        color: #66666E;
-    }
-    table tr.even
-    {
-        border-left: 1px solid #E6E6E6;
-        background-color: #ffffff;
-        color: #66666E;
-    }
-    table tr.odd td:hover, table tr.even td:hover
-    {
-        background-color: #E6E6E6;
-    }
-    		
-    span.comment
-    {
-        color: #8B0000;
-        font-style: italic;
-    }
-    span.string, span.char
-    {
-        color: #254117;
-    }
+
 
     .qmltype
     {
@@ -856,7 +907,6 @@
     *.qmlitem p
     {
     }
-
     #feedbackBox
     {
         display: none;
@@ -934,16 +984,14 @@
 
     .toc h3, .generic a
     {
-        font: 600 12px/1.2 Arial;
+        font: bold 12px/1.2 Arial;
     }
 
 	.generic{
-		/*max-width:75%;*/
 	}
 	.generic td{
 		padding:5px;
 	}
-	
 	.generic .alphaChar{
 	margin-top:5px;
 	}
@@ -991,6 +1039,16 @@
         padding-left: 0px;
     }
 
+	.wrap .content .toc h3{
+	border-bottom:0px;
+	margin-top:0px;
+	}	
+	
+	.wrap .content .toc h3  a:hover{
+	color:#00732F;
+	text-decoration:none;
+	}
+
 
     .wrap .content .toc .level2
     {
@@ -1007,7 +1065,6 @@
         font: normal 10px/1.2 Verdana;
         background: url(../images/bullet_dn.png) no-repeat 0 5px;
     }
-
     .relpage
     {
         -moz-border-radius: 7px 7px 7px 7px;
@@ -1071,6 +1128,24 @@
 	.functionIndex a{
 	display:inline-block;
 	}
+	
+/* end content elements */
+/* footer elements */
+
+   .footer
+    {
+        min-height: 100px;
+        color: #797775;
+        font: normal 9px/1 Verdana;
+        text-align: center;
+        padding-top: 40px;
+        background-color: #E6E7E8;
+        margin: 0;
+    }
+/* end footer elements */
+
+
+
 
     /* start index box */
     .indexbox
@@ -1082,15 +1157,15 @@
     .indexboxcont
     {
         display: block;
-       /* overflow: hidden;*/
+
     }
 
     .indexboxbar
     {
         background: transparent url(../images/horBar.png ) repeat-x left bottom;
         margin-bottom: 25px;
-     /*   background-image: none;
-        border-bottom: 1px solid #e2e2e2;*/
+
+
     }
 
     .indexboxcont .section
@@ -1141,7 +1216,7 @@
 
     .content .indexboxcont li
     {
-        font: normal 600 13px/1 Verdana;
+        font: normal bold 13px/1 Verdana;
     }
 
     .indexbox a:hover, .indexbox a:visited:hover
@@ -1190,87 +1265,285 @@
         visibility: hidden;
     }
 	
-.sidebar .search form input.loading
-{
-        background:url("../images/spinner.gif") no-repeat scroll right center transparent;
-}
 
-    /* end of screen media */
-
-.flowList{
-vertical-align:top;
-}	
-.alphaChar{
-width:100%;
-background-color:#F6F6F6;
-border:1px solid #E6E6E6;
--moz-border-radius: 7px 7px 7px 7px;
-font-size:12pt;
-padding-left:10px;
-margin-top:10px;
-margin-bottom:10px;
-}
 
-.flowList dl{
-}
-.flowList dd{
-display:inline-block;
-margin-left:10px;
-width:250px;
-}
-.wrap .content .flowList p{
-padding:0px;
-}
-pre.highlightedCode {
-	display: block;
-	overflow:hidden;
-}
-.floatingResult{
-	z-index:1;
-	position:relative;
-	padding-top:0px;
-	background-color:white;
-	border:solid 1px black;
-	height:250px;
-	width:600px;
-	overflow-x:hidden;
-	overflow-y:auto;
-}
+/* start of offline spec*/
+    .offline .wrapper .hd
+    {
+        background: url(../images/page.png) no-repeat 0 -15px;
+    }
+	    .offline .wrapper .bd
+    {
+        background: url(../images/bg_l_blank.png) repeat-y 0 0;
+    }
+    .offline .wrapper .ft
+    {
+        background: url(../images/page.png) no-repeat 0 -90px;
+    }
+    .offline .sidebar,
+	.offline .feedback,
+	.offline .t_button,
+	.offline #narrowsearch,
+	.offline #narrowmenu
+    {
+        display: none;
+    }
+    .offline .wrap
+    {
+        margin: 0 5px 0 5px;
+    }
+    .offline .wrap .breadcrumb
+    {
+    }
 
-	.floatingResult:hover{
-		display:block;
-	}
-	.floatingResult:hover{
-		/*display:none;*/
-	}
+    .offline .wrap .content
+    {
+        padding-top: 15px;
+    }
 
-	.wrap .content ol li {
-	background:none;
-	font:400 10pt/1 Verdana;
-	margin-bottom:10px;
-	margin-left:12px;
+
+/* end of offline spec*/
+	
+/* start of creator spec*/
+	.creator
+	{
+	margin-left:0px;
+	margin-right:0px;
+	padding-left:0px;
+	padding-right:0px;
 	}
-	.wrap .content ol li {
+	.creator .wrap .content ol li {
 	list-style-type:decimal;
 
 	}
-	.navTop{ 
-	float:right;
-	display:block;
-	padding-right:15px;
-	/*margin-top:10px;*/
+    .creator .header .icon,
+	.creator .feedback,
+	.creator .t_button,
+    .creator .feedback,
+	.creator #feedbackBox,
+	.creator #feedback,
+	.creator #blurpage,
+	.creator .indexbox .indexIcon span,
+	.creator .wrapper .hd,
+	.creator  .indexbox .indexIcon,
+	.creator .header #nav-logo,
+	.creator #offlinemenu,
+	.creator #offlinesearch,
+	.creator  .header #nav-topright,
+    .creator .header #shortCut ,
+	.creator .wrapper .hd,
+    .creator .wrapper .ft,
+	.creator .sidebar,
+	.creator .wrap .feedback
+    {
+	display:none;
+    }
+	
+	body.creator
+    {
+	background: none;
+
+        font: normal 13px/1.2 Verdana;
+        color: #363534;
+		background-color: #FFFFFF;
+    }
+
+
+
+    .creator .header, .footer, .wrapper
+    {
+        max-width: 1500px;
+        margin: 0px;
+    }
+
+   .creator .wrapper
+    {
+	position:relative;
+	top:50px;
+    }
+    .creator .wrapper .bd
+	{
+
+	background:#FFFFFF;
 	}
+
+
+   .creator .header, .footer
+    {
+        display: block;
+        clear: both;
+        overflow: hidden;
+    }
+    .creator .wrap .content p
+
+    {
+        line-height: 20px;
+        padding: 5px;
+    }
+
+    .creator .header .qtref span
+    {
+		background:none;
+    }	
+
+
 	
-	.wrap .content .toc h3{
-	border-bottom:0px;
-	margin-top:0px;
+		.creator .footer
+    {
+		border-top:1px solid #E5E5E5;
+        min-height: 100px;
+		margin:0px;
+    }
+	
+     .creator .wrap
+    {
+
+        padding:0 5px 0 5px;
+		margin: 0px;
+    }
+    .creator .wrap .toolbar
+    {
+
+
+	border-bottom:1px solid #E5E5E5;
+	width:100%,
+    }	
+    .creator .wrap .breadcrumb ul li a
+    {
+      /*  color: #363534;*/
+        color: #00732F;
+    }	
+	
+    .creator .wrap .content
+    {
+        padding: 0px;
+		word-wrap:break-word;
+    }
+	
+    .creator .wrap .content ol li { 
+        background:none; 
+        font: inherit; 
+        padding-left: 0px;
+    } 
+	
+    .creator .wrap .content .descr ol li {
+	margin-left: 45px;
+
+    }
+    .creator .content .alignedsummary
+    {
+        margin: 5px;
+		width:100%;
+    }
+	.creator .generic{
+		max-width:75%;
+	}
+	.creator .generic td{
+		padding:0;
 	}
+    .creator .indexboxbar
+    {
+		border-bottom:1px solid #E5E5E5;
+        margin-bottom: 25px;
+		background: none;
+    }
 	
-	.wrap .content .toc h3  a:hover{
-	color:#00732F;
-	text-decoration:none;
+	
+
+    .creator .header
+    {
+      width: 100%;
+      margin: 0;
+      height: auto;
+      background-color: #ffffff;
+      padding: 10px 0 5px 0;
+      overflow: visible;
+	  border-bottom: solid #E5E5E5 1px;
+	  z-index:1;
+
+
+
+
+
+
+
+
+	  position:fixed;
+    }
+
+
+    .creator .header .content
+    {
+    }
+    .creator .header .qtref
+    {
+      color: #00732F;
+      position: static;
+      float: left;
+      margin-left: 5px;
+      font: bold 18px/1 Arial;
+    }
+
+    .creator .header .qtref:visited
+    {
+      color: #00732F;
+	  }
+    .creator .header .qtref:hover
+    {
+      color: #00732F;
+	  text-decoration:none;
+	  }
+    .creator .header .qtref span
+    {
+      background-image: none;
+      text-indent: 0;
+	  text-decoration:none;
+    }
+
+
+
+
+
+
+    .creator .wrap .toolbar
+    {
+      display:block;
+	  padding-top:0px;
+    }
+
+
+
+    .creator .wrap .breadcrumb ul li {
+      font-weight: normal;
+    }
+
+    .creator .wrap .breadcrumb ul li a {
+      /*color: #44a51c;*/
+    }
+
+    .creator .wrap .breadcrumb ul li.last a {
+      /*color: #363534;*/
+    }
+    
+	.creator #narrowmenu ul
+	{
+	  border-bottom:solid 1px #E5E5E5;
+	  border-left:solid 1px #E5E5E5;
+	  border-right:solid 1px #E5E5E5;
 	}
+
+    .creator #narrowmenu li ul {
+      margin-top:-15px;
+   }
+
+
+	.creator .toc {
+	margin:10px 20px 10px 10px;
+	}	
+/* end of creator spec*/
 	
+}
+
 /* end of screen media */
 
 /* start of print media */