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

20 files changed, 359 insertions, 448 deletions

diff --git a/doc/src/declarative/examples.qdoc b/doc/src/declarative/examples.qdoc
index 39da323..9929cfe 100644
--- a/doc/src/declarative/examples.qdoc
+++ b/doc/src/declarative/examples.qdoc
@@ -203,6 +203,11 @@ The examples can be found in Qt's \c examples/declarative directory.
 \o \l{declarative/threading/workerscript}{WorkerScript}
 \endlist
 
+\section2 Screen orientation
+\list
+\o \l{declarative/screenorientation}{Example}
+\endlist
+
 \section2 SQL Local Storage
 \list
 \o \l{declarative/sqllocalstorage}{Example}
diff --git a/doc/src/declarative/qdeclarativestates.qdoc b/doc/src/declarative/qdeclarativestates.qdoc
index e7607c6..0b91756 100644
--- a/doc/src/declarative/qdeclarativestates.qdoc
+++ b/doc/src/declarative/qdeclarativestates.qdoc
@@ -32,57 +32,174 @@
 
 \section1 Overview
 
-QML states typically describe user interface configurations, including:
+User interfaces are designed to present different interface configurations in
+different scenarios, or to modify their appearances in response to user
+interaction. Often, there are a set of changes that are made concurrently, such
+that the interface could be seen to be internally changing from one \e state to
+another. 
+
+This applies generally to interface elements regardless of their complexity. 
+A photo viewer may initially present images in a grid, and when an image is
+clicked, change to a "detailed" state where the individual image is expanded
+and the interface is changed to present new options for image editing. On the
+other end of the scale, when a simple button is pressed, it may change to a
+"pressed" state in which its color and position is modified to give a pressed
+appearance.
+
+In QML, any object can change between different \e states to apply sets of
+changes that modify the properties of relevant items. Each \e state could 
+present a different configuration that could, for example:
+
 \list
-\o What UI elements are present
-\o The properties of those elements (including how they behave)
-\o What actions are available
+\o Show some UI elements and hide others
+\o Present different available actions to the user
+\o Start, stop or pause animations
+\o Execute some script required in the new state
+\o Change a property value for a particular item
+\o Show a different view or "screen"
 \endlist
 
-A state can also be thought of as a set of batched changes from a default configuration.
+Changes between states can be animated using \l {Transitions}{transitions}, as
+discussed further below.
 
-Examples of states in modern UI:
-\list
-\o An Address Book application with a 'View Contact' state and an 'Edit Contact' State. In the first state the contact information presented is read-only (using labels), and in the second it is editable (using editors).
-\o A button with a pressed and unpressed state. When pressed the text moves slightly down and to the right, and the button has a slightly darker appearance.
-\endlist
+All \l {Item}-based objects have a \e {default state}, and can specify additional
+states by adding new \l State objects to the item's \l {Item::}{states}
+property. Each state has a \e name that is unique for all states within that
+item; the default state's name is an empty string. To change the current state
+of an item, set the \l {Item::}{state} property to the name of the state.
+
+Non-Item objects can use states through the StateGroup element.
 
-\section1 States in QML
 
-In QML:
+\section1 Creating states
+
+To create a state, add a \l State object to the item's \l {Item::}{states} property,
+which holds a list of states for that item.
+
+Following is an example. Here, the \l Rectangle is initially placed in the
+default (0, 0) position. It has defined an additional state named "moved", in
+which a PropertyChanges object repositions the rectangle to (50, 50). Clicking
+within the MouseArea changes the state to the "moved" state, thus moving the \l
+Rectangle.
+
+\snippet doc/src/snippets/declarative/states.qml 0
+ 
+A \l State item defines all the changes to be made in the new state. You
+could specify additional properties to be changed, or create additional 
+PropertyChanges for other objects. (Note that a \l State can modify the
+properties of other objects, not just the object that owns the state.)
+
+For example:
+
+\qml
+State {
+    name: "moved"
+    PropertyChanges { target: myRect; x: 50; y: 50; color: "blue" }
+    PropertyChanges { target: someOtherItem; width: 1000 }            
+}
+\endqml
+
+A \l State is not limited to performing modifications on property values. It 
+can also:
+
 \list
-\o Any object can use states.
-\o There is a default state. The default state can be explicitly set.
-\o A state can affect the properties of other objects, not just the object owning the state (and not just that object's children).
+\o Run some script using StateChangeScript
+\o Override an existing signal handler for an object using PropertyChanges
+\o Re-parent an \l Item using ParentChanges
+\o Modify anchor values using AnchorChanges
 \endlist
 
-To define a state for an item, add a \l State element to the \l{Item::states}{states} property. To
-change the current state of an \l Item, set the \l{Item::state}{state} property to the name
-of the required state.
+The \l {declarative/animation/states}{States and Transitions example} 
+demonstrates how to declare a basic set of states and apply animated 
+transitions between them.
 
-Here is an example of using states. In the default state \c myRect is positioned at 0,0. In the 'moved' state it is positioned at 50,50. Clicking within the mouse area changes the state from the default state to the 'moved' state, thus moving the rectangle.
 
-\snippet doc/src/snippets/declarative/states.qml 0
-\snippet doc/src/snippets/declarative/states.qml 1
+\section1 The default state
 
-State changes can be animated using \l{state-transitions}{Transitions}.
+Of course, the \l Rectangle in the example above could have simply been moved
+by setting its position to (50, 50) in the mouse area's \c onClicked handler.
+However, aside from enabling batched property changes, the use of states allows
+an item to revert to its \e {default state}, which contains all of the items'
+initial property values before they were modified in a state change.
 
-For example, adding this code to the above \c Item element animates the transition to the "moved" state:
+The default state is specified by an empty string. If the MouseArea in the
+above example was changed to this:
 
-\snippet doc/src/snippets/declarative/states.qml transitions
+\qml
+MouseArea {
+    anchors.fill: parent
+    onClicked: myRect.state == 'moved' ? myRect.state = "" : myRect.state = 'moved';
+}
+\endqml      
 
-See \l{state-transitions}{Transitions} for more information.
+This would toggle the \l Rectangle's state between the \e moved and \e default
+states when clicked. The properties can be reverted to their initial
+values without requiring the definition of another \l State that defines these
+value changes.
 
 
-Other things you can do in a state change:
-\list
-\o Override signal handlers with PropertyChanges
-\o Change an item's visual parent with ParentChange
-\o Change an item's anchors with AnchorChanges
-\o Run some script with StateChangeScript
-\endlist
 
+\section1 The "when" property
+
+The \l {State::}{when} property is useful for specifying when a state should be
+applied. This can be set to an expression that evaluates to \c true when an
+item should change to a particular state.
+
+If the above example was changed to this:
+ 
+\qml 
+Rectangle {
+    ...
+
+    MouseArea {
+        id: mouseArea
+        anchors.fill: parent
+    }
+
+    states: State {
+        name: "moved"; when: mouseArea.pressed
+        ...
+    }
+\endqml 
+
+The \l Rectangle would automatically change to the \e moved state when the
+mouse is pressed, and revert to the default state when it is released. This is
+simpler (and a better, more declarative method) than creating \c onPressed 
+and \c onReleased handlers in the MouseArea to set the current state.
+
+
+\section1 Animating state changes
+
+
+State changes can be easily animated through \l {Transitions}{transitions}. A
+\l Transition defines the animations that should be applied when an item
+changes from one state to another.
+
+If the above example was modified to include the following \l Transition, the
+movement of the \l Rectangle would be animated:
+
+\qml
+Rectangle {
+    ...
+
+    MouseArea { ... }
+
+    states: [
+       ...
+    ]
+     
+    transitions: [
+        Transition {
+            NumberAnimation { properties: "x,y"; duration: 500 }
+        }
+    ]
+ }
+\endqml  
+
+This \l Transition defines that if any \c x or \c y properties have changed
+during a state change within this item, their values should be animated over 500
+millliseconds.
 
-The \l {declarative/animation/states}{States and Transitions example} demonstrates how to declare a basic set of states and then apply animated transitions between them.
+See the \l Transitions documentation for more information.
 
 */
diff --git a/doc/src/declarative/qmlviewer.qdoc b/doc/src/declarative/qmlviewer.qdoc
index 5efc0ce..41c4c80 100644
--- a/doc/src/declarative/qmlviewer.qdoc
+++ b/doc/src/declarative/qmlviewer.qdoc
@@ -197,10 +197,10 @@ Rectangle {
 \o \c runtime.orientation
 
 \o This property indicates the current orientation of the QML Viewer. On the
-N900 platform, this property automatically updates to reflect the device's 
-actual orientation; on other platforms, this indicates the orientation currently
-selected in the QML Viewer's \e {Settings -> Properties} menu. The
-\c orientation value can be one of the following:
+N900 platform and most S60 5.0-based or newer Symbian devices, this property 
+automatically updates to reflect the device's actual orientation; on other platforms, 
+this indicates the orientation currently selected in the QML Viewer's 
+\e {Settings -> Properties} menu. The \c orientation value can be one of the following:
 
 \list
 \o \c Orientation.Portrait
diff --git a/doc/src/development/developing-with-qt.qdoc b/doc/src/development/developing-with-qt.qdoc
index ffc5a8e..f9b38b8 100644
--- a/doc/src/development/developing-with-qt.qdoc
+++ b/doc/src/development/developing-with-qt.qdoc
@@ -27,12 +27,22 @@
 
 /*!
     \page developing-with-qt.html
-    \title Cross Platform Development with Qt
+    
+    \title Cross-platform & Platform-specific Development
+	Qt allows you to write advanced applications and UIs once, and deploy them
+	across desktop and embedded operating systems without rewriting the source
+	code. The top section of this page provides an overview of the tools and
+	techniques used in Qt application development. Still, you might want to add
+	platform-specific features to your code. The bottom section of the page
+	links to documents that describe platform-specific features provided by Qt,
+	and discuss issues related to particular platforms and environments.
+
+	\section1 Cross-platform Development with Qt
 
     Qt is provided with a set of build tools to help developers automate
     the process of building and installing Qt applications.
 
-    \table 100%
+    \table
     \header \o Development \o Cross-Platform Issues \o Specific Tools
     \row
     \o
@@ -57,4 +67,49 @@
         \o \l {Resource Compiler (rcc)}
     \endlist
     \endtable
-*/
+	
+	\section1 Platform-specific Development with Qt
+	
+    These documents describe platform-specific features provided by Qt, and
+    discuss issues related to particular platforms and environments.
+	
+    \table
+    \row
+    \o
+     \list
+        \o \l {Calling Qt Functions From Unix Signal Handlers}
+        \o \l {Compiler Notes}
+        \o \l {Developing Qt Applications for Mac OS X}
+        \o \l {Known Issues}
+        \o \l {Platform Notes}
+        \o \l {Platform Notes - Symbian}
+        \o \l {Qt For ActiveX}
+        \o \l {Qt for Embedded Linux Classes}
+        \o \l {Qt for Embedded Platforms}
+        \o \l {Qt for Mac OS X - Specific Issues}
+        \o \l {Qt is Mac OS X Native}
+        \o \l {Supported Platforms}
+        \o \l {The qtmain Library}
+        \o \l {Window System Specific Notes}
+     \endlist
+    \o
+    \list
+        \o  Workaround to make it work.
+        \o  Information about the C++ compilers and tools used to build Qt.
+        \o  Information for developing Qt applications for Mac OS X
+        \o  A summary of known issues in this Qt version at the time of release.
+        \o  Information about the platforms on which Qt can be used.
+        \o  Information about the state of support for the Symbian platform.
+        \o  Qt API's for using ActiveX controls, servers, and COM.
+        \o  Classes that are specific to Qt for Embedded Linux.
+        \o  Documents related to Qt for Embedded Platforms.
+        \o  A description of issues with Qt that are specific to Mac OS X.
+        \o  An explanation of Qt's native features on Mac OS X.
+        \o  The platforms supported by Nokia for Qt.
+        \o  Describes the use and license of the qtmain helper library.
+        \o  Collections of notes about Qt implementations on different window systems.
+    \endlist
+    \endtable
+	
+	
+*/
\ No newline at end of file
diff --git a/doc/src/examples/qml-examples.qdoc b/doc/src/examples/qml-examples.qdoc
index a8be401..8d3aa25 100644
--- a/doc/src/examples/qml-examples.qdoc
+++ b/doc/src/examples/qml-examples.qdoc
@@ -412,6 +412,14 @@
     \endtable
 */
 
+
+/*!
+    \title Screen orientation
+    \example declarative/screenorientation
+
+    This example shows how to implement screen orientation support for your application.
+*/
+
 /*!
     \title SQL Local Storage Example
     \example declarative/sqllocalstorage
diff --git a/doc/src/files-and-resources/resources.qdoc b/doc/src/files-and-resources/resources.qdoc
index b0b0e3c..3177af8 100644
--- a/doc/src/files-and-resources/resources.qdoc
+++ b/doc/src/files-and-resources/resources.qdoc
@@ -54,7 +54,7 @@
     The resource system is based on tight cooperation between \l qmake,
     \l rcc (Qt's resource compiler), and QFile. It obsoletes Qt 3's
     \c qembed tool and the
-    \l{http://qt.nokia.com/doc/qq/qq05-iconography.html#imagestorage}{image
+    \l{http://doc.qt.nokia.com/qq/qq05-iconography.html}{image
     collection} mechanism.
 
     \section1 Resource Collection Files (\c{.qrc})
diff --git a/doc/src/frameworks-technologies/eventsandfilters.qdoc b/doc/src/frameworks-technologies/eventsandfilters.qdoc
index e792161..fb14a3b 100644
--- a/doc/src/frameworks-technologies/eventsandfilters.qdoc
+++ b/doc/src/frameworks-technologies/eventsandfilters.qdoc
@@ -100,7 +100,7 @@
     event delivery mechanisms are flexible. The documentation for
     QCoreApplication::notify() concisely tells the whole story; the
     \e{Qt Quarterly} article
-    \l{http://qt.nokia.com/doc/qq/qq11-events.html}{Another Look at Events}
+    \l{http://doc.qt.nokia.com/qq/qq11-events.html}{Another Look at Events}
     rehashes it less concisely. Here we will explain enough for 95%
     of applications.
 
diff --git a/doc/src/getting-started/gettingstarted.qdoc b/doc/src/getting-started/gettingstarted.qdoc
index 391aec3..9b6b5d5 100644
--- a/doc/src/getting-started/gettingstarted.qdoc
+++ b/doc/src/getting-started/gettingstarted.qdoc
@@ -62,7 +62,7 @@
 12        }
     \endcode
 
-    Let's go through the code line by line. In the first two lines, we
+    Let us go through the code line by line. In the first two lines, we
     include the header files for QApplication and QTextEdit, which are
     the two classes that we need for this example. All Qt classes have
     a header file named after them.
@@ -97,9 +97,9 @@
     following shell commands build the program.
 
     \code
-        vattekar@positive:~/testing/gssnippets/part1$ qmake -project
-        vattekar@positive:~/testing/gssnippets/part1$ qmake
-        vattekar@positive:~/testing/gssnippets/part1$ make
+        qmake -project
+        qmake
+        make
     \endcode
 
     This will leave an executable in the \c part1 directory (note that
@@ -134,7 +134,7 @@
 
     \image gs2.png
 
-    Let's take a look at the code.
+    Let us take a look at the code.
 
     \code
  1        #include <QtGui>
@@ -217,7 +217,7 @@
 
     \image gs3.png
 
-    Let's look at the code:
+    Let us look at the code:
 
     \code
  5        class Notepad : public QWidget
@@ -275,7 +275,7 @@
     We now use the function \l{QObject::}{tr()} around our user
     visible strings. This function is necessary when you want to
     provide your application in more than one language (e.g.  English
-    and Chinese). We won't go into details here, but you can follow
+    and Chinese). We will not go into details here, but you can follow
     the \c {Qt Linguist} link from the learn more table.
 
     \section2 Learn More
@@ -312,8 +312,8 @@
     The following shell commands build the example.
 
     \code
-        vattekar@positive:~/testing/gssnippets/part3$ qmake
-        vattekar@positive:~/testing/gssnippets/part3$ make
+        qmake
+        make
     \endcode
 
     \section1 Using a QMainWindow
@@ -326,7 +326,7 @@
 
     \image gs4.png
 
-    Let's look at the new \c Notepad class definition.
+    Let us look at the new \c Notepad class definition.
 
     \code
         #include <QtGui>
@@ -422,7 +422,7 @@
 
     \image gs5.png
 
-    Let's start with the \c open() slot:
+    We will start with the \c open() slot:
 
     \code
         QString fileName = QFileDialog::getOpenFileName(this, tr("Open File"), "",
@@ -451,7 +451,7 @@
 
     If we have a file name, we try to open the file with
     \l{QIODevice::}{open()}, which returns true if the file could be
-    opened. We won't go into error handling here, but you can follow
+    opened. We will not go into error handling here, but you can follow
     the links from the learn more section. If the file could not be
     opened, we use QMessageBox to display a dialog with an error
     message (see the QMessageBox class description for further
@@ -465,7 +465,7 @@
     edit. We then \l{QIODevice::}{close()} the file to return the file
     descriptor back to the operating system.
 
-    Now, let's move on to the the \c save() slot.
+    Now, let us move on to the the \c save() slot.
 
     \code
         QString fileName = QFileDialog::getSaveFileName(this, tr("Save File"), "",
diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc
index 4acf212..7efd1e6 100644
--- a/doc/src/index.qdoc
+++ b/doc/src/index.qdoc
@@ -65,8 +65,8 @@
               </div>
               <div class="sectionlist  tricol">
                 <ul>
-                    <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="qt-basic-concepts.html">Programming with Qt</a></li> -->
+                    <li><a href="qt-basic-concepts.html">Basic 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>
@@ -78,7 +78,7 @@
                     <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>
+                <!--    <li><a href="declarativeui.html">Qt & GUI design</a></li> -->
                 </ul>
               </div>
             </div>
@@ -94,12 +94,12 @@
               </div>
               <div class="section sectionlist">
                 <ul>
-                  <li><a href="http://doc.qt.nokia.com/qtcreator-2.0/index.html">Qt Creator</a></li>
+                  <li><a href="http://doc.qt.nokia.com/qtcreator-2.0/index.html">Qt Creator</a> (online document)</li>
                   <li><a href="designer-manual.html">Qt Designer</a></li>
                   <li><a href="linguist-manual.html">Qt Linguist</a></li>
                   <li><a href="assistant-manual.html">Qt Assistant</a></li>
-                  <li><a href="http://doc.qt.nokia.com/qtsimulator-1.0/simulator-description.html">Qt Simulator</a></li>
-                  <li><a href="http://qt.nokia.com/developer/eclipse-integration">Integration</a> and <a href="http://qt.nokia.com/products/appdev">add-ins</a></li>
+                  <li><a href="http://doc.qt.nokia.com/qtsimulator-1.0/simulator-description.html">Qt Simulator</a> (online document)</li>
+                  <li><a href="http://qt.nokia.com/developer/eclipse-integration">Integration</a> (online document) and <a href="http://qt.nokia.com/products/appdev">add-ins</a> (online document)</li>
                   <li><a href="qvfb.html">Virtual Framebuffer</a></li>
                 </ul>
               </div>
diff --git a/doc/src/internationalization/linguist-manual.qdoc b/doc/src/internationalization/linguist-manual.qdoc
index c8d8e9d..fa992af 100644
--- a/doc/src/internationalization/linguist-manual.qdoc
+++ b/doc/src/internationalization/linguist-manual.qdoc
@@ -1414,8 +1414,8 @@
     \c -pluralonly command line option, which allows the creation of
     TS files containing only entries with plural forms.
 
-    See the \l{http://qt.nokia.com/doc/qq/}{Qt Quarterly} Article 
-    \l{http://qt.nokia.com/doc/qq/qq19-plurals.html}{Plural Forms in Translations}
+    See the \l{http://doc.qt.nokia.com/qq/}{Qt Quarterly} Article 
+    \l{http://doc.qt.nokia.com/qq/qq19-plurals.html}{Plural Forms in Translations}
     for further details on this issue.
 
     \section2 Coping With C++ Namespaces
diff --git a/doc/src/porting/porting4.qdoc b/doc/src/porting/porting4.qdoc
index f355e7b..0bbf35f 100644
--- a/doc/src/porting/porting4.qdoc
+++ b/doc/src/porting/porting4.qdoc
@@ -472,7 +472,7 @@
     \section1 Explicit Sharing
 
     Qt 4 is the first version of Qt that contains no \link
-    http://qt.nokia.com/doc/3.3/shclass.html explicitly shared
+    http://doc.qt.nokia.com/3.3/shclass.html explicitly shared
     \endlink classes. All classes that were explicitly shared in Qt 3
     are \e implicitly shared in Qt 4:
 
@@ -1079,7 +1079,7 @@
     ensuring that the string is '\\0'-terminated. Another important
     issue was that conversions between \c QCString and QByteArray often
     gave confusing results. (See the
-    \l{http://qt.nokia.com/doc/qq/qq05-achtung.html#qcstringisastringofchars}{Achtung!
+    \l{http://doc.qt.nokia.com/qq/qq05-achtung.html#qcstringisastringofchars}{Achtung!
     Binary and Character Data} article in \e{Qt Quarterly} for an
     overview of the pitfalls.)
 
@@ -2440,13 +2440,13 @@
     that provides the old semantics. See the Q3Painter documentation
     for details and for the reasons why we had to make this change.
 
-    The \l{http://qt.nokia.com/doc/3.3/qpainter.html#CoordinateMode-enum}{QPainter::CoordinateMode}
+    The \l{http://doc.qt.nokia.com/3.3/qpainter.html#CoordinateMode-enum}{QPainter::CoordinateMode}
     enum has been removed in Qt 4. All clipping
     operations are now defined using logical coordinates and are subject
     to transformation operations.
 
     The
-    \l{http://qt.nokia.com/doc/3.3/qpainter.html#RasterOP-enum}{QPainter::RasterOP}
+    \l{http://doc.qt.nokia.com/3.3/qpainter.html#RasterOP-enum}{QPainter::RasterOP}
     enum has been replaced with QPainter::CompositionMode.
 
     \section1 QPicture
@@ -3258,7 +3258,7 @@
 
     \list \o If you use Q3SocketDevice in a thread to perform blocking
     network I/O (a technique encouraged by the \e{Qt Quarterly}
-    article \l{http://qt.nokia.com/doc/qq/qq09-networkthread.html}
+    article \l{http://doc.qt.nokia.com/qq/qq09-networkthread.html}
     {Unblocking Networking}), you can now use QTcpSocket, QFtp, or
     QNetworkAccessManager, which can be used from non-GUI threads.
 
@@ -4052,7 +4052,7 @@
 
     Sample code on how to do obtain similar behavior from Qt 4, previously
     handled by some of the above functions can be found in the
-    \l{http://qt.nokia.com/doc/qwidget-qt3.html}{Qt 3 Support Members for QWidget}
+    \l{http://doc.qt.nokia.com/qwidget-qt3.html}{Qt 3 Support Members for QWidget}
     page.
 
     A widget now receives change events in its QWidget::changeEvent()
@@ -4150,7 +4150,7 @@
     clearWFlags() has no direct replacement. You can use
     QWidget::setAttribute() instead. For example,
     \c{setAttribute(..., false)} to clear an attribute. More information
-    is available \l{http://qt.nokia.com/doc/qwidget.html#setAttribute}{here}.
+    is available \l{http://doc.qt.nokia.com/qwidget.html#setAttribute}{here}.
 
     testWFlags() was renamed to \l{QWidget::testAttribute()}{testAttribute()}.
 
diff --git a/doc/src/qt-webpages.qdoc b/doc/src/qt-webpages.qdoc
index 89d564f..0c61285 100644
--- a/doc/src/qt-webpages.qdoc
+++ b/doc/src/qt-webpages.qdoc
@@ -141,7 +141,7 @@
 */
 
 /*!
-    \externalpage http://qt.nokia.com/doc/supported-platforms.html
+    \externalpage http://doc.qt.nokia.com/supported-platforms.html
     \title Platform Support Policy
 */
 
@@ -151,7 +151,7 @@
 */
 
 /*!
-    \externalpage http://qt.nokia.com/doc/supported-platforms.html
+    \externalpage http://doc.qt.nokia.com/supported-platforms.html
     \title Qt 4 Platforms Overview
 */
 
@@ -161,7 +161,7 @@
 */
 
 /*!
-    \externalpage http://qt.nokia.com/doc/qq/
+    \externalpage http://doc.qt.nokia.com/qq/
     \title Qt Quarterly
 */
 
@@ -181,7 +181,7 @@
 */
 
 /*!
-    \externalpage http://qt.nokia.com/doc/qtcanvas
+    \externalpage http://doc.qt.nokia.com/qtcanvas
     \title QtCanvas
 */
 
diff --git a/doc/src/snippets/declarative/state-when.qml b/doc/src/snippets/declarative/state-when.qml
new file mode 100644
index 0000000..6d3bb75
--- /dev/null
+++ b/doc/src/snippets/declarative/state-when.qml
@@ -0,0 +1,55 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+import Qt 4.7
+//![0]
+Rectangle {
+    id: myRect
+    width: 100; height: 100
+    color: "red"
+
+    MouseArea { id: mouseArea; anchors.fill: parent }
+
+    states: State {
+        name: "hidden"; when: mouseArea.pressed
+        PropertyChanges { target: myRect; opacity: 0 }
+    }
+}
+//![0]
diff --git a/doc/src/snippets/declarative/state.qml b/doc/src/snippets/declarative/state.qml
index af6b103..ce2653b 100644
--- a/doc/src/snippets/declarative/state.qml
+++ b/doc/src/snippets/declarative/state.qml
@@ -44,13 +44,19 @@ import Qt 4.7
 Rectangle {
     id: myRect
     width: 100; height: 100
-    color: "red"
+    color: "black"
 
-    MouseArea { id: mouseArea; anchors.fill: parent }
-
-    states: State {
-        name: "hidden"; when: mouseArea.pressed
-        PropertyChanges { target: myRect; opacity: 0 }
+    MouseArea { 
+        id: mouseArea
+        anchors.fill: parent 
+        onClicked: myRect.state == 'clicked' ? myRect.state = "" : myRect.state = 'clicked';
     }
+
+    states: [
+        State {
+            name: "clicked"
+            PropertyChanges { target: myRect; color: "red" }
+        }
+    ]
 }
 //![0]
diff --git a/doc/src/snippets/declarative/states.qml b/doc/src/snippets/declarative/states.qml
index c3b1796..127e3a7 100644
--- a/doc/src/snippets/declarative/states.qml
+++ b/doc/src/snippets/declarative/states.qml
@@ -40,42 +40,22 @@
 ****************************************************************************/
 //![0]
 import Qt 4.7
-
-Item {
-    id: myItem
+ 
+Rectangle {
+    id: myRect
     width: 200; height: 200
+    color: "red"
 
-    Rectangle {
-        id: myRect
-        width: 100; height: 100
-        color: "red"
+    MouseArea {
+        anchors.fill: parent
+        onClicked: myRect.state = 'moved'
     }
 
     states: [
         State {
             name: "moved"
-            PropertyChanges {
-                target: myRect
-                x: 50
-                y: 50
-            }
+            PropertyChanges { target: myRect; x: 50; y: 50 }
         }
     ]
-
-    MouseArea {
-        anchors.fill: parent
-        onClicked: myItem.state = 'moved'
-    }
-//![0]
-
-//![transitions]
-transitions: [
-    Transition {
-        NumberAnimation { properties: "x,y"; duration: 500 }
-    }
-]
-//![transitions]
-
-//![1]
 }
-//![1]
+//![0]
diff --git a/doc/src/template/style/OfflineStyle.css b/doc/src/template/style/OfflineStyle.css
deleted file mode 100644
index 9f5d28b..0000000
--- a/doc/src/template/style/OfflineStyle.css
+++ /dev/null
@@ -1,251 +0,0 @@
-@media screen
-{
-
-    .wrapper
-    {
-	top:50px;
-    background: none;
-
-    }
-    .wrapper .bd
-    {
-        background: none;
-        position: relative;
-    }
-
-
-    
- 
-    body.offline
-    {
-      background-image: none;
-      background-color: #FFFFFF;
-	  
-    }
-
-    .offline .footer {
-      margin: 0;
-    }
-    .offline .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;
-    }
-
-    .offline .header .content
-    {
-    }
-    .offline .header .qtref
-    {
-      color: #00732F;
-      position: static;
-      float: left;
-      margin-left: 5px;
-      font: bold 18px/1 Arial;
-    }
-
-    .offline .header .qtref:visited
-    {
-      color: #00732F;
-	  }
-    .offline .header .qtref:hover
-    {
-      color: #00732F;
-	  text-decoration:none;
-	  }
-    .offline .header .qtref span
-    {
-      background-image: none;
-      text-indent: 0;
-	  text-decoration:none;
-    }
-
-    .offline .wrap
-    {
-        margin: 0 5px 0 5px;
-    }
-
-    .offline .wrap .toolbar
-    {
-      display:block;
-	  padding-top:5px;
-    }
-
-    .offline .wrap .breadcrumb ul li {
-      font-weight: normal;
-    }
-
-    .offline .wrap .breadcrumb ul li a {
-      /*color: #44a51c;*/
-    }
-
-    .offline .wrap .breadcrumb ul li.last a {
-      /*color: #363534;*/
-    }
-    
-
-    
-    .narrow .indexboxcont .section {
-      width: 64%;
-      padding-left: 0;
-    }
-    
-    .narrow .indexboxcont .sectionlist {
-      width: 32.5%;
-    }
-
-    .header .icon,
-	.sidebar,
-	.feedback,
-	.t_button,
-    .feedback,
-	#feedbackBox,
-	#feedback,
-	#blurpage,
-	.indexbox .indexIcon span,
-	.wrapper .hd,
-	.offline .indexbox .indexIcon,
-	.offline .header #nav-logo,
-	#offlinemenu,
-	#offlinesearch,
-	.offline .header #nav-topright,
-    .offline .header #shortCut ,
-	.offline .wrapper .hd,
-    .offline .wrapper .ft,
-	.offline .sidebar,
-	.offline .wrap .feedback
-    {
-	display:none;
-    }
-
-    /* end offline mode */
-#narrowmenu {
-      display: none;
-      float: right;
-      margin: 15px 40px 0 0;
-      font-size: 11px;
-    }
-
-    .narrow #narrowmenu {
-      display: block;
-    }
-	
-	#narrowsearch{
-		display:none;
-	}
-
-	#narrowmenu ul
-	{
-	  border-bottom:solid 1px #E5E5E5;
-	  border-left:solid 1px #E5E5E5;
-	  border-right:solid 1px #E5E5E5;
-	}
-
-    #narrowmenu a {
-      line-height: 1.1;
-      background: url(../images/arrow_down.png) no-repeat 100% 50%;
-      white-space: nowrap;
-      padding: 0 16px 0 5px;
-    }
-
-    #narrowmenu li {
-      margin-left: 20px;
-    }
-
-    #narrowmenu li li {
-      margin: 0 0 5px 0;
-    }
-
-    #narrowmenu li li a {
-      padding: 0;
-      background-image: none;
-    }
-
-    #narrowmenu li,
-    #narrowmenu li ul {
-      background-color: #fff;
-    }
-
-    #narrowmenu li ul {
-      width: auto;
-      padding: 5px;
- 	  margin-top:-15px;
-   }
-
-    .sf-menu li:hover ul, .sf-menu li.sfHover ul {
-      top: 1.2em;
-    }
-.sf-menu, .sf-menu * {
-	margin:			0;
-	padding:		0;
-	list-style:		none;
-}
-.sf-menu {
-	line-height:	1.0;
-}
-.sf-menu ul {
-	position:		absolute;
-	top:			-999em;
-	width:			10em; /* left offset of submenus need to match (see below) */
-}
-.sf-menu ul li {
-	width:			100%;
-}
-.sf-menu li:hover {
-	visibility:		inherit; /* fixes IE7 'sticky bug' */
-}
-.sf-menu li {
-	float:			left;
-	position:		relative;
-}
-.sf-menu a {
-	display:		block;
-	position:		relative;
-}
-.sf-menu li:hover ul,
-.sf-menu li.sfHover ul {
-	left:			0;
-	top:			2.5em; /* match top ul list item height */
-	z-index:		99;
-}
-ul.sf-menu li:hover li ul,
-ul.sf-menu li.sfHover li ul {
-	top:			-999em;
-}
-ul.sf-menu li li:hover ul,
-ul.sf-menu li li.sfHover ul {
-	left:			10em; /* match ul width */
-	top:			0;
-}
-ul.sf-menu li li:hover li ul,
-ul.sf-menu li li.sfHover li ul {
-	top:			-999em;
-}
-ul.sf-menu li li li:hover ul,
-ul.sf-menu li li li.sfHover ul {
-	left:			10em; /* match ul width */
-	top:			0;
-}
-	.wrap .content ol li {
-	background:none;
-	font:400 10pt/1 Verdana;
-	margin-bottom:10px;
-	margin-left:12px;
-	}
-	.wrap .content ol li {
-	list-style-type:decimal;
-
-	}
-
-
-
-}
-/* end of screen media */
-
diff --git a/doc/src/template/style/narrow.css b/doc/src/template/style/narrow.css
index 05159aa..e4ad135 100644
--- a/doc/src/template/style/narrow.css
+++ b/doc/src/template/style/narrow.css
@@ -15,7 +15,12 @@
     }
 
     .narrow .footer {
-      margin: 0;
+      margin: 0px;
+    }
+
+    .creator .header, .creator .header .content, .creator .footer, .creator .wrapper {
+      margin: 0px;
+      min-width: 300px;
     }
     .narrow .header
     {
@@ -126,6 +131,11 @@
         margin: 0 5px 0 5px;
     }
 
+    .creator .wrap
+    {
+        margin: 0px;
+		background:#FFFFFF;
+    }
     .narrow .wrap .toolbar
     {
       border-bottom: none;
@@ -135,7 +145,14 @@
     {
         padding-top: 15px;
     }
-
+    .creator .wrap .content
+    {
+        padding-top: 10px;
+    }
+    .creator .wrap .content .guide
+    {
+        padding-top: 15px;
+    }
     .narrow .wrap .feedback
     {
         display: none;
diff --git a/doc/src/template/style/style.css b/doc/src/template/style/style.css
index 9f80921..259591f 100755
--- a/doc/src/template/style/style.css
+++ b/doc/src/template/style/style.css
@@ -1345,7 +1345,7 @@
 
         font: normal 13px/1.2 Verdana;
         color: #363534;
-		background-color: #FFFFFF;
+		background-color: #FAFAFA;
     }
 
 
@@ -1406,7 +1406,9 @@
 
 
 	border-bottom:1px solid #E5E5E5;
-	width:100%,
+	/*width:100%;*/
+	margin-left:-5px;
+	margin-right:-5px;
     }	
     .creator .wrap .breadcrumb ul li a
     {
diff --git a/doc/src/template/style/superfish_skin.css b/doc/src/template/style/superfish_skin.css
deleted file mode 100644
index 8d84827..0000000
--- a/doc/src/template/style/superfish_skin.css
+++ /dev/null
@@ -1,83 +0,0 @@
-
-/*** DEMO SKIN ***/
-.sf-menu {
-	float:			left;
-	margin-bottom:	1em;
-}
-.sf-menu a {
-	border-left:	1px solid #fff;
-	border-top:		1px solid #CFDEFF;
-	padding: 		.75em 1em;
-	text-decoration:none;
-}
-.sf-menu a, .sf-menu a:visited  { /* visited pseudo selector so IE6 applies text colour*/
-	color:			#13a;
-}
-.sf-menu li {
-	background:		#BDD2FF;
-}
-.sf-menu li li {
-	background:		#AABDE6;
-}
-.sf-menu li li li {
-	background:		#9AAEDB;
-}
-.sf-menu li:hover, .sf-menu li.sfHover,
-.sf-menu a:focus, .sf-menu a:hover, .sf-menu a:active {
-	background:		#CFDEFF;
-	outline:		0;
-}
-
-/*** arrows **/
-.sf-menu a.sf-with-ul {
-	padding-right: 	2.25em;
-	min-width:		1px; /* trigger IE7 hasLayout so spans position accurately */
-}
-.sf-sub-indicator {
-	position:		absolute;
-	display:		block;
-	right:			.75em;
-	top:			1.05em; /* IE6 only */
-	width:			10px;
-	height:			10px;
-	text-indent: 	-999em;
-	overflow:		hidden;
-	background:		url('../images/arrows-ffffff.png') no-repeat -10px -100px; /* 8-bit indexed alpha png. IE6 gets solid image only */
-}
-a > .sf-sub-indicator {  /* give all except IE6 the correct values */
-	top:			.8em;
-	background-position: 0 -100px; /* use translucent arrow for modern browsers*/
-}
-/* apply hovers to modern browsers */
-a:focus > .sf-sub-indicator,
-a:hover > .sf-sub-indicator,
-a:active > .sf-sub-indicator,
-li:hover > a > .sf-sub-indicator,
-li.sfHover > a > .sf-sub-indicator {
-	background-position: -10px -100px; /* arrow hovers for modern browsers*/
-}
-
-/* point right for anchors in subs */
-.sf-menu ul .sf-sub-indicator { background-position:  -10px 0; }
-.sf-menu ul a > .sf-sub-indicator { background-position:  0 0; }
-/* apply hovers to modern browsers */
-.sf-menu ul a:focus > .sf-sub-indicator,
-.sf-menu ul a:hover > .sf-sub-indicator,
-.sf-menu ul a:active > .sf-sub-indicator,
-.sf-menu ul li:hover > a > .sf-sub-indicator,
-.sf-menu ul li.sfHover > a > .sf-sub-indicator {
-	background-position: -10px 0; /* arrow hovers for modern browsers*/
-}
-
-/*** shadows for all but IE6 ***/
-.sf-shadow ul {
-	background:	url('../images/shadow.png') no-repeat bottom right;
-	padding: 0 8px 9px 0;
-	-moz-border-radius-bottomleft: 17px;
-	-moz-border-radius-topright: 17px;
-	-webkit-border-top-right-radius: 17px;
-	-webkit-border-bottom-left-radius: 17px;
-}
-.sf-shadow ul.sf-shadow-off {
-	background: transparent;
-}
diff --git a/doc/src/widgets-and-layouts/layout.qdoc b/doc/src/widgets-and-layouts/layout.qdoc
index aa4a933..798a7a1 100644
--- a/doc/src/widgets-and-layouts/layout.qdoc
+++ b/doc/src/widgets-and-layouts/layout.qdoc
@@ -242,7 +242,7 @@
 
     For further guidance when implementing these functions, see the
     \e{Qt Quarterly} article
-    \l{http://qt.nokia.com/doc/qq/qq04-height-for-width.html}
+    \l{http://doc.qt.nokia.com/qq/qq04-height-for-width.html}
     {Trading Height for Width}.