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

15 files changed, 504 insertions, 54 deletions

diff --git a/doc/src/development/assistant-manual.qdoc b/doc/src/development/assistant-manual.qdoc
index 1ed99db..8d3c667 100644
--- a/doc/src/development/assistant-manual.qdoc
+++ b/doc/src/development/assistant-manual.qdoc
@@ -676,13 +676,13 @@
 
     The following example shows how this can be done:
 
-    \snippet doc/src/snippets/code/doc_src_assistant-manual.cpp 2
+    \snippet doc/src/snippets/code/doc_src_assistant-manual.qdoc 2
 
     Once \QA is running, you can send commands by using the stdin channel of
     the process. The code snippet below shows how to tell \QA to show a certain
     page in the documentation.
 
-    \snippet doc/src/snippets/code/doc_src_assistant-manual.cpp 3
+    \snippet doc/src/snippets/code/doc_src_assistant-manual.qdoc 3
 
     Note that the trailing newline character is required to mark the end
     of the input.
@@ -745,7 +745,7 @@
     instead of one line for every command. The commands have to be separated by
     a semicolon, as shown in the following example:
 
-    \snippet doc/src/snippets/code/doc_src_assistant-manual.cpp 4
+    \snippet doc/src/snippets/code/doc_src_assistant-manual.qdoc 4
 
     \section1 Compatibility with Old Formats
 
diff --git a/doc/src/examples/activeqt/hierarchy-demo-snippet.qdoc b/doc/src/examples/activeqt/hierarchy-demo-snippet.qdoc
index 5df3224..a36ebbb 100644
--- a/doc/src/examples/activeqt/hierarchy-demo-snippet.qdoc
+++ b/doc/src/examples/activeqt/hierarchy-demo-snippet.qdoc
@@ -1,3 +1,31 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Free Documentation License
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of this
+** file.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//! [script]
 <script language="javascript">
 function createSubWidget( form )
 {
@@ -37,3 +65,4 @@ CODEBASE="http://qt.nokia.com/demos/hierarchy.cab">
 <input type="edit" ID="fontEdit" value="MS Sans Serif" />
 <input type="button" value = "Set Font" onClick="setFont(this.form)" />
 </form>
+//! [script]
diff --git a/doc/src/examples/activeqt/hierarchy.qdoc b/doc/src/examples/activeqt/hierarchy.qdoc
index 8d14b68..791af1f 100644
--- a/doc/src/examples/activeqt/hierarchy.qdoc
+++ b/doc/src/examples/activeqt/hierarchy.qdoc
@@ -25,7 +25,7 @@
 **
 ****************************************************************************/
 
-/*! 
+/*!
     \page qaxserver-demo-hierarchy.html
     \title Qt Widget Hierarchy
 
@@ -84,5 +84,5 @@
     your WebBrowser to support ActiveX controls, and scripting to be
     enabled.
 
-    \quotefile examples/activeqt/hierarchy-demo-snippet.qdoc
+    \snippet examples/activeqt/hierarchy-demo-snippet.qdoc script
 */
diff --git a/doc/src/platforms/supported-platforms.qdoc b/doc/src/platforms/supported-platforms.qdoc
index da9a32e..5b76a86 100644
--- a/doc/src/platforms/supported-platforms.qdoc
+++ b/doc/src/platforms/supported-platforms.qdoc
@@ -312,7 +312,7 @@
 		- Qt supports a wide range of Windows CE/Mobile platform variants.
 		\o \l{Qt for Windows CE Requirements}{Qt for Windows CE/Mobile
 		Requirements} - Software required to run Qt on Windows CE/Mobile.
-		\o \l{Installing Qt for Windows CE Platforms}{Installing Qt for  
+		\o \l{Installing Qt for Windows CE}{Installing Qt for  
 		Windows CE/Mobile Platforms} - Build Qt for Windows CE/Mobile
 		development.
 		\o \l{Platform and Compiler Notes - Windows CE}{Platform and
@@ -504,8 +504,6 @@
 	programmers to create, build, debug and run Qt applications accross all
 	supported platforms.	
 	
-\omit
-	
 	\section3 Licensing
 	
 	Qt for Symbian is available under the Qt Commercial License, the LGPL
@@ -518,7 +516,6 @@
 	communication and data exchange. Therefore, most Symbian developers
 	can use Qt for Symbian under the LGPL.
 	
-\endomit
 
 	Additional \l{Cross-Platform and Platform-Specific Development
 	}{Cross-Platform and Platform-Specific Development} information.
@@ -526,39 +523,37 @@
 */
 /*!
 
-\omit
     \page maemo-support.html
-    \title Support for Maemo/MeeGo
-    \brief Platform support for Maemo/MeeGo.
+    \title Support for Maemo
+    \brief Platform support for Maemo.
     \ingroup platform-specific
 	\ingroup platform-details
 	
-	\section2 Qt on Maemo/MeeGo
+	\section2 Qt on Maemo
 	
 	Qt is a comprehensive application and UI framework for developing
-	Maemo and MeeGo applications that can also be deployed across major
+	Maemo applications that can also be deployed across major
 	device and desktop operating systems without rewriting the source code.
-	If you are developing apps for the Symbian, Mameo or MeeGo platforms
+	If you are developing apps for the Symbian, Mameo platforms
 	in most cases, you can use Qt under the free LGPL licensing option.
 	Qt is cross-platform, and that means that you can use the code from
 	one single code-base and rebuild for all \l{Supported Platforms}
-	{supported platforms}.
+	{supported platforms}. Maemo 6 is now MeeGo.
 
- 	\section1 Getting Started on Maemo/MeeGo
-	
+ 	\section1 Getting Started on Maemo	
 	\list
-		\o \l{Supported Platforms}{Supported Maemo/MeeGo platforms}
-		- Qt support for Maemo/MeeGo versions.
-		\o \l{Qt for Maemo Requirements}{Qt for Maemo/MeeGo
-		Requirements} - Software required to run Qt on Maemo/MeeGo.
+		\o \l{Supported Platforms}{Supported Maemo platforms}
+		- Qt support for Maemo versions.
+		\o \l{Qt for Maemo Requirements}{Qt for Maemo
+		Requirements} - Software required to run Qt on Maemo.
 		\o \l{Installing Qt for Maemo}{Installing Qt for  
-		Maemo/MeeGo} - Build Qt for Maemo/MeeGo	development.
+		Maemo} - Build Qt for Maemo	development.
 		\o \l{Platform and Compiler Notes - Maemo}{Platform and
-		Compiler Notes - Maemo/MeeGo} - Platform specific notes.
+		Compiler Notes - Maemo} - Platform specific notes.
         \o \l{Getting Started Guides}{Getting started}
 	\endlist
 	
-	\section1 Key Features for Maemo/MeeGo Development
+	\section1 Key Features for Maemo Development
 	
 	\section2 Native Look and Feel
 	
@@ -568,16 +563,16 @@
 	
 	\section2 Graphics Features
 	
-	Qt for Maemo/MeeGo provides a powerful paint engine that cotain
+	Qt for Maemo provides a powerful paint engine that cotain
 	features such as anti aliasing, gradients, curves and transparency.
 	It also has animation support with timelines and easing curves. Qt
-	for Maemo/MeeGo also supports hardware acceleration using ARM NEON 
+	for Maemo also supports hardware acceleration using ARM NEON 
 	and OpenGL ES 2.0.
 
 	\section2 Device Configurations
 	
-	Applications developed with Qt for Maemo/MeeGo will across all
-	supported Maemo/MeeGo devices provide automatic support for switching
+	Applications developed with Qt for Maemo will across all
+	supported Maemo devices provide automatic support for switching
 	between landscape and portrait mode. They will support input methods,
 	including predictive text input and on-screen keyboard. The
 	applications will also have support for one finger touch events and
@@ -598,8 +593,85 @@
 	
 	Additional \l{Cross-Platform and Platform-Specific Development
 	}{Cross-Platform and Platform-Specific Development} information.
+		
+*/
+
+/*!
+
+    \page meego-support.html
+    \title Support for MeeGo
+    \brief Platform support for MeeGo.
+    \ingroup platform-specific
+	\ingroup platform-details
+	
+	\section2 Qt on MeeGo
+	
+	Qt is a comprehensive application and UI framework for developing
+	MeeGo applications that can also be deployed across major
+	device and desktop operating systems without rewriting the source code.
+	If you are developing apps for the Symbian, MeeGo platforms
+	in most cases, you can use Qt under the free LGPL licensing option.
+	Qt is cross-platform, and that means that you can use the code from
+	one single code-base and rebuild for all \l{Supported Platforms}
+	{supported platforms}.
+
+ 	\section1 Getting Started on MeeGo
+	
+	\list
+		\o \l{Supported Platforms}{Supported MeeGo platforms}
+		- Qt support for MeeGo versions.
+		\o \l{Qt for MeeGo Requirements}{Qt for MeeGo
+		Requirements} - Software required to run Qt on MeeGo.
+		\o \l{Installing Qt for MeeGo}{Installing Qt for  
+		MeeGo} - Build Qt for MeeGo	development.
+		\o \l{Platform and Compiler Notes - MeeGo}{Platform and
+		Compiler Notes - MeeGo} - Platform specific notes.
+        \o \l{Getting Started Guides}{Getting started}
+	\endlist
+	
+	\section1 Key Features for MeeGo Development
+	
+	\section2 Native Look and Feel
+	
+	Qt will detect which theme the device is running and applies the
+	style at runtime to your Qt application. Widgets are optimized
+	for touch screen usage.
+	
+	\section2 Graphics Features
+	
+	Qt for MeeGo provides a powerful paint engine that cotain
+	features such as anti aliasing, gradients, curves and transparency.
+	It also has animation support with timelines and easing curves. Qt
+	for MeeGo also supports hardware acceleration using ARM NEON, x86, 
+	and OpenGL ES 2.0.
+
+	\section2 Device Configurations
+	
+	Qt is the foundation of MeeGo UI and application development and
+	therefore Qt will be present in all upcoming MeeGo devices. Qt
+	can provide automatic support for:
+	\list
+	\o Switching between landscape and portrait mode
+	\o Input Methods, including predictive text input and on-screen
+	keyboard
+	\o Configurable kinetic scrolling
+
+	\section2 Maemo - Linux/X11
+	
+	Qt supports a wide range of X11 platform variants, such as: Solaris,
+	AIX, HP-UX, Maemo 5 and MeeGo. Qt for MeeGo contains all Qt modules
+	and features the same functionality as the Qt on X11 version.
+	
+	\section2 Cross-platform development using Qt Creator
+	
+	\l{http://doc.qt.nokia.com/qtcreator-snapshot/index.html}{Qt Creator} is
+	a complete Cross-platform IDE included in the Qt SDK. The IDE allows
+	programmers to create, build, debug and run Qt applications accross all
+	supported platforms.	
+	
+	Additional \l{Cross-Platform and Platform-Specific Development
+	}{Cross-Platform and Platform-Specific Development} information.
 	
-	\endomit
 	
 */
 	
@@ -634,9 +706,8 @@
 		\o \l{Support for Symbian}{Symbian}
 		\row
 		\o
-		\omit
-		\o\l{Support for Maemo/MeeGo}{Maemo/MeeGo}
-		\endomit		 
+		\o\l{Support for MeeGo}{MeeGo}
+		\o\l{Support for Maemo}{Maemo}
 	\endtable
 		
 	\section1 Supported platform details
@@ -688,6 +759,10 @@
                                      \o gcc (\l{http://www.codesourcery.com/}{Codesourcery version)}
     \row    \o Windows CE 5.0 (ARMv4i, x86, MIPS)
                                      \o MSVC 2005 WinCE 5.0 Standard (x86, pocket, smart, mipsii)
+    \row    \o Maemo 5(Linux, ARM, X11)
+                                     \o gcc (\l{http://www.scratchbox.org/}{Scratchbox)}
+    \row    \o MeeGo (Linux, ARM, X11)
+                                     \o gcc (\l{http://www.scratchbox.org/}{Scratchbox)}
     \row    \o Symbian (Symbian/S60 5.0)
                                      \o RVCT 2.2 [build 686 or later], WINSCW 3.2.5 [build 482 or later], GCCE (for applications)
     \endtable
@@ -726,8 +801,6 @@
                                      \o MSVC 2005 WinCE 5.0 Standard (x86, pocket, smart, mipsii)
     \row    \o Windows Embedded CE 6.0 (ARMv4i, x86, MIPS)
                                      \o MSVC 2008 WinCE Embedded 6.0 Professional
-    \row    \o Maemo 5(Linux, ARM, X11)
-                                     \o gcc (\l{http://www.scratchbox.org/}{Scratchbox)}
     \row    \o Symbian (Symbian/S60 3.1, 3.2)
                                      \o RVCT 2.2 [build 686 or later], WINSCW 3.2.5 [build 482 or later], GCCE (for applications)
     \endtable
diff --git a/doc/src/snippets/code/doc_src_plugins-howto.cpp b/doc/src/snippets/code/doc_src_plugins-howto.cpp
new file mode 100644
index 0000000..06bf903
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_plugins-howto.cpp
@@ -0,0 +1,89 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//! [0]
+class MyStylePlugin : public QStylePlugin
+{
+public:
+    QStringList keys() const;
+    QStyle *create(const QString &key);
+};
+//! [0]
+
+
+//! [1]
+#include "mystyleplugin.h"
+
+QStringList MyStylePlugin::keys() const
+{
+    return QStringList() << "MyStyle";
+}
+
+QStyle *MyStylePlugin::create(const QString &key)
+{
+    if (key.toLower() == "mystyle")
+        return new MyStyle;
+    return 0;
+}
+
+Q_EXPORT_PLUGIN2(pnp_mystyleplugin, MyStylePlugin)
+//! [1]
+
+
+//! [2]
+QApplication::setStyle(QStyleFactory::create("MyStyle"));
+//! [2]
+
+
+//! [4]
+#include <QApplication>
+#include <QtPlugin>
+
+Q_IMPORT_PLUGIN(qjpeg)
+Q_IMPORT_PLUGIN(qgif)
+Q_IMPORT_PLUGIN(qkrcodecs)
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    ...
+    return app.exec();
+}
+//! [4]
diff --git a/doc/src/snippets/code/doc_src_plugins-howto.pro b/doc/src/snippets/code/doc_src_plugins-howto.pro
new file mode 100644
index 0000000..eb0ec28
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_plugins-howto.pro
@@ -0,0 +1,50 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#! [3]
+CONFIG += release
+#! [3]
+
+
+#! [5]
+QTPLUGIN     += qjpeg \
+                qgif \
+                qkrcodecs
+#! [5]
diff --git a/doc/src/snippets/code/doc_src_qtscripttools.pro b/doc/src/snippets/code/doc_src_qtscripttools.pro
new file mode 100644
index 0000000..e87644d
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_qtscripttools.pro
@@ -0,0 +1,43 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#! [1]
+QT += scripttools
+#! [1]
diff --git a/doc/src/snippets/code/doc_src_stylesheet.cpp b/doc/src/snippets/code/doc_src_stylesheet.cpp
new file mode 100644
index 0000000..3faaf2d
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_stylesheet.cpp
@@ -0,0 +1,140 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//! [21]
+qApp->setStyleSheet("QPushButton { color: white }");
+//! [21]
+
+
+//! [22]
+myPushButton->setStyleSheet("* { color: blue }");
+//! [22]
+
+
+//! [23]
+myPushButton->setStyleSheet("color: blue");
+//! [23]
+
+
+//! [24]
+qApp->setStyleSheet("QGroupBox { color: red; } ");
+//! [24]
+
+//! [25]
+qApp->setStyleSheet("QGroupBox, QGroupBox * { color: red; }");
+//! [25]
+
+
+//! [26]
+class MyPushButton : public QPushButton {
+    // ...
+}
+
+// ...
+qApp->setStyleSheet("MyPushButton { background: yellow; }");
+//! [26]
+
+
+//! [27]
+namespace ns {
+    class MyPushButton : public QPushButton {
+        // ...
+    }
+}
+
+// ...
+qApp->setStyleSheet("ns--MyPushButton { background: yellow; }");
+//! [27]
+
+
+//! [32]
+void CustomWidget::paintEvent(QPaintEvent *)
+{
+    QStyleOption opt;
+    opt.init(this);
+    QPainter p(this);
+    style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this);
+}
+//! [32]
+
+
+//! [88]
+qApp->setStyleSheet("QLineEdit { background-color: yellow }");
+//! [88]
+
+
+//! [89]
+myDialog->setStyleSheet("QLineEdit { background-color: yellow }");
+//! [89]
+
+
+//! [90]
+myDialog->setStyleSheet("QLineEdit#nameEdit { background-color: yellow }");
+//! [90]
+
+
+//! [91]
+nameEdit->setStyleSheet("background-color: yellow");
+//! [91]
+
+
+//! [92]
+nameEdit->setStyleSheet("color: blue; background-color: yellow");
+//! [92]
+
+
+//! [93]
+nameEdit->setStyleSheet("color: blue;"
+                        "background-color: yellow;"
+                        "selection-color: yellow;"
+                        "selection-background-color: blue;");
+//! [93]
+
+
+//! [95]
+QLineEdit *nameEdit = new QLineEdit(this);
+nameEdit->setProperty("mandatoryField", true);
+
+QLineEdit *emailEdit = new QLineEdit(this);
+emailEdit->setProperty("mandatoryField", true);
+
+QSpinBox *ageSpinBox = new QSpinBox(this);
+ageSpinBox->setProperty("mandatoryField", true);
+//! [95]
diff --git a/doc/src/template/style/offline.css b/doc/src/template/style/offline.css
index 3689ee8..c3f90c3 100644
--- a/doc/src/template/style/offline.css
+++ b/doc/src/template/style/offline.css
@@ -26,14 +26,14 @@
     {
         text-decoration: none;
     }
-    li
-    {
-        list-style: none;
-    }
     ol li
     {
         list-style: decimal;
     }
+    ul li
+    {
+        list-style: none;
+    }
     caption, th
     {
         text-align: left;
@@ -76,6 +76,8 @@
     {
         margin-left: 0.5em;
         margin-right: 0.5em;
+        font-family: sans-serif;
+        line-height: normal
     }
     a
     {
@@ -124,13 +126,13 @@
     }
     th
     {
-        padding: 0.5em 1.5em 0.5em 1.5em;
+        padding: 0.5em 1.5em 0.5em 1em;
         background-color: #E1E1E1;
         border-left: 1px solid #E6E6E6;
     }
     td
     {
-        padding: 0.25em 1.5em 0.25em 2em;
+        padding: 0.25em 1.5em 0.25em 1em;
     }
 
     td.rightAlign
@@ -162,7 +164,6 @@
     span.comment
     {
         color: #008B00;
-        font-style: italic
     }
     span.string, span.char
     {
@@ -240,10 +241,6 @@
         margin-bottom: 0.5em
     }
 
-    .naviNextPrevious
-    {
-        display: none
-    }
     .header .breadcrumb
     {
         font-size: 90%;
@@ -310,19 +307,19 @@
     .content h1
     {
         font-weight: bold;
-        font-size: 150%
+        font-size: 130%
     }
 
     .content h2
     {
         font-weight: bold;
-        font-size: 135%;
+        font-size: 120%;
         width: 100%;
     }
     .content h3
     {
         font-weight: bold;
-        font-size: 120%;
+        font-size: 110%;
         width: 100%;
     }
     .content table p
@@ -472,6 +469,11 @@
         padding: 0.25em 0.5em 0.25em 0.5em;
     }
 
+    .toc
+    {
+        font-size: 80%
+    }
+
     .header .content .toc ul
     {
         padding-left: 0px;
diff --git a/examples/webkit/fancybrowser/fancybrowser.pro b/examples/webkit/fancybrowser/fancybrowser.pro
index 3786d9c..df4dbe3 100644
--- a/examples/webkit/fancybrowser/fancybrowser.pro
+++ b/examples/webkit/fancybrowser/fancybrowser.pro
@@ -12,5 +12,7 @@ INSTALLS += target sources
 
 symbian {
     TARGET.UID3 = 0xA000CF6C
+    TARGET.EPOCHEAPSIZE = 0×020000 0×4000000
+    TARGET.CAPABILITY += Location NetworkServices
     include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
 }
diff --git a/src/corelib/statemachine/qhistorystate.cpp b/src/corelib/statemachine/qhistorystate.cpp
index 350c1a0..7093c32 100644
--- a/src/corelib/statemachine/qhistorystate.cpp
+++ b/src/corelib/statemachine/qhistorystate.cpp
@@ -168,6 +168,9 @@ QAbstractState *QHistoryState::defaultState() const
 /*!
   Sets this history state's default state to be the given \a state.
   \a state must be a sibling of this history state.
+
+  Note that this function does not set \a state as the initial state
+  of its parent.
 */
 void QHistoryState::setDefaultState(QAbstractState *state)
 {
diff --git a/src/gui/itemviews/qheaderview.cpp b/src/gui/itemviews/qheaderview.cpp
index c857670..2ccf792 100644
--- a/src/gui/itemviews/qheaderview.cpp
+++ b/src/gui/itemviews/qheaderview.cpp
@@ -643,8 +643,12 @@ int QHeaderView::sectionSize(int logicalIndex) const
 }
 
 /*!
-    Returns the section position of the given \a logicalIndex, or -1 if the
-    section is hidden.
+
+    Returns the section position of the given \a logicalIndex, or -1
+    if the section is hidden. The position is measured in pixels from
+    the first visible item's top-left corner to the top-left corner of
+    the item with \a logicalIndex. The measurement is along the x-axis
+    for horizontal headers and along the y-axis for vertical headers.
 
     \sa sectionViewportPosition()
 */
diff --git a/src/gui/itemviews/qlistwidget.cpp b/src/gui/itemviews/qlistwidget.cpp
index 94e3b76..61a935f 100644
--- a/src/gui/itemviews/qlistwidget.cpp
+++ b/src/gui/itemviews/qlistwidget.cpp
@@ -1500,7 +1500,9 @@ void QListWidget::setCurrentRow(int row, QItemSelectionModel::SelectionFlags com
 }
 
 /*!
-    Returns a pointer to the item at the coordinates \a p.
+    Returns a pointer to the item at the coordinates \a p. The coordinates
+    are relative to the list widget's \l{QAbstractScrollArea::}{viewport()}.
+
 */
 QListWidgetItem *QListWidget::itemAt(const QPoint &p) const
 {
@@ -1514,6 +1516,9 @@ QListWidgetItem *QListWidget::itemAt(const QPoint &p) const
     \overload
 
     Returns a pointer to the item at the coordinates (\a x, \a y).
+    The coordinates are relative to the list widget's
+    \l{QAbstractScrollArea::}{viewport()}.
+
 */
 
 
diff --git a/src/gui/itemviews/qtreewidget.cpp b/src/gui/itemviews/qtreewidget.cpp
index 4db29d6..2ea9a43 100644
--- a/src/gui/itemviews/qtreewidget.cpp
+++ b/src/gui/itemviews/qtreewidget.cpp
@@ -2830,7 +2830,8 @@ void QTreeWidget::setCurrentItem(QTreeWidgetItem *item, int column,
 
 
 /*!
-  Returns a pointer to the item at the coordinates \a p.
+  Returns a pointer to the item at the coordinates \a p. The coordinates
+  are relative to the tree widget's \l{QAbstractScrollArea::}{viewport()}.
 
   \sa visualItemRect()
 */
@@ -2844,7 +2845,8 @@ QTreeWidgetItem *QTreeWidget::itemAt(const QPoint &p) const
     \fn QTreeWidgetItem *QTreeWidget::itemAt(int x, int y) const
     \overload
 
-    Returns a pointer to the item at the coordinates (\a x, \a y).
+    Returns a pointer to the item at the coordinates (\a x, \a y). The coordinates
+    are relative to the tree widget's \l{QAbstractScrollArea::}{viewport()}.
 */
 
 /*!
diff --git a/tools/qdoc3/helpprojectwriter.cpp b/tools/qdoc3/helpprojectwriter.cpp
index f2e2f04..949507f 100644
--- a/tools/qdoc3/helpprojectwriter.cpp
+++ b/tools/qdoc3/helpprojectwriter.cpp
@@ -350,6 +350,14 @@ bool HelpProjectWriter::generateSection(HelpProject &project,
             }
             break;
 
+        case Node::Variable:
+            {
+                QString location = HtmlGenerator::fullDocumentLocation(node);
+                project.files.insert(location.left(location.lastIndexOf(QLatin1Char('#'))));
+                project.keywords.append(keywordDetails(node));
+            }
+            break;
+
         // Fake nodes (such as manual pages) contain subtypes, titles and other
         // attributes.
         case Node::Fake: {