Index: trunk/doc/doc.pri
===================================================================
--- trunk/doc/doc.pri	(revision 691)
+++ trunk/doc/doc.pri	(revision 769)
@@ -48,9 +48,9 @@
 htmldocs.files = $$QT_BUILD_TREE/doc/html
 htmldocs.path = $$[QT_INSTALL_DOCS]
-htmldocs.CONFIG += no_check_exist
+htmldocs.CONFIG += no_check_exist directory
 
 qchdocs.files= $$QT_BUILD_TREE/doc/qch
 qchdocs.path = $$[QT_INSTALL_DOCS]
-qchdocs.CONFIG += no_check_exist
+qchdocs.CONFIG += no_check_exist directory
 
 docimages.files = $$QT_BUILD_TREE/doc/src/images
Index: trunk/doc/src/classes/phonon-api.qdoc
===================================================================
--- trunk/doc/src/classes/phonon-api.qdoc	(revision 691)
+++ trunk/doc/src/classes/phonon-api.qdoc	(revision 769)
@@ -1652,4 +1652,14 @@
     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 Phonon::MediaSource, Phonon::AudioOutput, VideoWidget,
Index: trunk/doc/src/deployment/deployment.qdoc
===================================================================
--- trunk/doc/src/deployment/deployment.qdoc	(revision 691)
+++ trunk/doc/src/deployment/deployment.qdoc	(revision 769)
@@ -933,5 +933,5 @@
 
     "C:/customPath/plugins " 
-    "C:/Qt/4.6.2/plugins" 
+    "C:/Qt/4.6.3/plugins" 
     "E:/myApplication/directory/"
 
Index: trunk/doc/src/development/qmake-manual.qdoc
===================================================================
--- trunk/doc/src/development/qmake-manual.qdoc	(revision 691)
+++ trunk/doc/src/development/qmake-manual.qdoc	(revision 769)
@@ -859,5 +859,5 @@
     XCode build system.
 
-    Furthermore, The selected "Active Build Configuration" is stored
+    Furthermore, the selected "Active Build Configuration" is stored
     in a .pbxuser file, which is generated by xcode on first load, not
     created by qmake.
@@ -980,5 +980,5 @@
     If \c UID3 is not specified, qmake will automatically generate a \c UID3
     suitable for development and debugging. This value should be manually
-    specified for applications that are to be released. In order to optain
+    specified for applications that are to be released. In order to obtain
     an official UID, please contact Nokia. Both \c SID and \c VID default to empty values.
 
@@ -1422,10 +1422,18 @@
     override languages statement, you must override also package-header
     statement and all other statements which are language specific.
+
+    On the Symbian platform, the \c default_deployment item specifies
+    default platform and package dependencies. Those dependencies can be
+    selectively disabled if alternative dependencies need to be defined
+    - e.g. if a specific device is required to run the application or
+    more languages need to be supported by the package file. The supported
+    \c default_deployment rules that can be disabled are:
     
-    On the Symbian platform, the \c default_deployment item specifies 
-    default platform dependencies. It can be overwritten if a more 
-    restrictive set is needed - e.g. if a specific
-    device is required to run the application.
-    
+    \list
+    \o pkg_depends_qt
+    \o pkg_depends_webkit
+    \o pkg_platform_dependencies
+    \endlist
+
     For example:
     
@@ -1728,6 +1736,13 @@
     \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 139
 
+    There is also a convenience function for adding conditional rules
+    called \c{addMMPRules}. Suppose you need certain functionality
+    to require different library depending on architecture. This
+    can be specified with \c{addMMPRules} as follows:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 148
+
     \note You should not use this variable to add MMP statements that are
-    explicitly supported by their own variables, such as 
+    explicitly supported by their own variables, such as
     \c TARGET.EPOCSTACKSIZE. 
     Doing so could result in duplicate statements in the MMP file.
@@ -2878,7 +2893,7 @@
     \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 144
     
-    This will add the specified statement to the end of the generated 
-    registration resource file. As an impact of this statement, the application
-    will not be visible in application shell.
+    This will add the specified statement to the end of the \c APP_REGISTRATION_INFO
+    resource struct in the generated registration resource file.
+    As an impact of this statement, the application will not be visible in application shell.
     
     It is also possible to add multiple rows in a single block. Each double
@@ -2893,14 +2908,34 @@
     be launched in background.
 
-    For detailed list of possible RSS statements, please refer to the
-    Symbian platform help.    
+    For detailed list of possible \c APP_REGISTRATION_INFO statements, please refer to the
+    Symbian platform help.
 
     \note You should not use \c RSS_RULES variable to set the following RSS statements:
-    
-    app_file
-    localisable_resource_file
-    localisable_resource_id
-
-    These statements are internally handled by qmake.     
+    \c app_file, \c localisable_resource_file, and \c localisable_resource_id.
+
+    These statements are internally handled by qmake.
+
+    There is a number of special modifiers you can attach to \c RSS_RULES to specify where
+    in the application registration file the rule will be written:
+
+    \table
+    \header \o Modifier \o Location of the rule
+    \row \o <no modifier>        \o Inside \c APP_REGISTRATION_INFO resource struct.
+    \row \o .header              \o Before \c APP_REGISTRATION_INFO resource struct.
+    \row \o .footer              \o After \c APP_REGISTRATION_INFO resource struct.
+    \row \o .service_list        \o Inside a \c SERVICE_INFO item in the \c service_list
+                                 of \c APP_REGISTRATION_INFO
+    \row \o .file_ownership_list \o Inside a \c FILE_OWNERSHIP_INFO item in the
+                                 \c file_ownership_list of \c APP_REGISTRATION_INFO
+    \row \o .datatype_list       \o Inside a \c DATATYPE item in the \c datatype_list of
+                                 \c APP_REGISTRATION_INFO
+    \endtable
+
+    For example:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 151
+
+    This example will define service information for a fictional service that requires
+    an icon to be supplied via the \c opaque_data of the service information.
 
     \target S60_VERSION
@@ -2961,4 +2996,32 @@
 
     \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 51
+
+    It is possible to modify this default behavior of \c SUBDIRS by giving
+    additional modifiers to \c SUBDIRS elements. Supported modifiers are:
+
+    \table
+    \header \o Modifier \o Effect
+    \row \o .subdir     \o Use the specified subdirectory instead of \c SUBDIRS value.
+    \row \o .file       \o Specify the subproject \c pro file explicitly. Cannot be
+                        used in conjunction with \c .subdir modifier.
+    \row \o .condition  \o Specifies a \c bld.inf define that must be true for
+                        subproject to be built. Available only on Symbian platform.
+    \row \o .depends    \o This subproject depends on specified subproject.
+                        Available only on platforms that use makefiles.
+    \row \o .makefile   \o The makefile of subproject.
+                        Available only on platforms that use makefiles.
+    \row \o .target     \o Base string used for makefile targets related to this
+                        subproject.
+                        Available only on platforms that use makefiles.
+    \endtable
+
+    For example, define two subdirectories, both of which reside in a different directory
+    than the \c SUBDIRS value, and one of the subdirectories must be built before the other:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 149
+
+    For example, define a subdirectory that is only build for emulator builds in Qt for Symbian:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 150
 
     \target TARGET
@@ -3505,5 +3568,5 @@
     \section1 Properties
 
-    \c qmake has a system of persistant information, this allows you to
+    \c qmake has a system of persistent information, this allows you to
     \c set a variable in qmake once, and each time qmake is invoked this
     value can be queried. Use the following to set a property in qmake:
@@ -3683,5 +3746,5 @@
     dependent .prl files, continuing until all libraries have been resolved.
     At this point, the Makefile is created as usual, and the libraries are
-    linked explicitlyy against the application.
+    linked explicitly against the application.
 
     The internals of the .prl file are left closed so they can easily
Index: trunk/doc/src/development/qtestlib.qdoc
===================================================================
--- trunk/doc/src/development/qtestlib.qdoc	(revision 691)
+++ trunk/doc/src/development/qtestlib.qdoc	(revision 769)
@@ -238,5 +238,5 @@
     The code insde the QBENCHMARK macro will be measured, and possibly also repeated
     several times in order to get an accurate measurement. This depends on the selected
-    measurement back-end. Several back-ends are available an can be selected on the
+    measurement back-end. Several back-ends are available. They can be selected on the
     command line:
     
@@ -245,5 +245,5 @@
     \table
     \header \o Name
-         \o Commmand-line Arguemnt
+         \o Commmand-line Argument
          \o Availability
     \row \o Walltime
Index: trunk/doc/src/examples/googlesuggest.qdoc
===================================================================
--- trunk/doc/src/examples/googlesuggest.qdoc	(revision 691)
+++ trunk/doc/src/examples/googlesuggest.qdoc	(revision 769)
@@ -112,5 +112,5 @@
 
     Key event handling is implemented so that Enter and Return execute the
-    selected link, while the Escape key hides the popup. Sine we want to be
+    selected link, while the Escape key hides the popup. Since we want to be
     able to navigate the list of suggestions using the different navigation
     keys on the keyboard we let Qt continue regular event processing for those
Index: trunk/doc/src/examples/scribble.qdoc
===================================================================
--- trunk/doc/src/examples/scribble.qdoc	(revision 691)
+++ trunk/doc/src/examples/scribble.qdoc	(revision 769)
@@ -75,7 +75,6 @@
     \endlist
 
-    We will start by reviewing the \c ScribbleArea class, which
-    contains the interesting, then we will take a look at the \c
-    MainWindow class that uses it.
+    We will start by reviewing the \c ScribbleArea class. Then we will
+    review the \c MainWindow class, which uses \c ScribbleArea.
 
     \section1 ScribbleArea Class Definition
Index: trunk/doc/src/examples/svgalib.qdoc
===================================================================
--- trunk/doc/src/examples/svgalib.qdoc	(revision 691)
+++ trunk/doc/src/examples/svgalib.qdoc	(revision 769)
@@ -43,4 +43,7 @@
     \example qws/svgalib
     \title Accelerated Graphics Driver Example
+
+    \warning This example was designed to work with Qt 4.4 and will not work
+    with current versions of Qt. It will be removed from Qt 4.7.
 
     The Accelerated Graphics Driver example shows how you can write
Index: trunk/doc/src/frameworks-technologies/activeqt.qdoc
===================================================================
--- trunk/doc/src/frameworks-technologies/activeqt.qdoc	(revision 691)
+++ trunk/doc/src/frameworks-technologies/activeqt.qdoc	(revision 769)
@@ -58,4 +58,5 @@
 
     \ingroup platform-specific
+    \ingroup frameworks-technologies
     \keyword ActiveQt
 
@@ -70,16 +71,23 @@
     \endlist
 
+    For more information about using ActiveX with Qt, see
+    \l{Building ActiveX servers and controls with Qt}.
+
     The ActiveQt framework consists of two modules:
 
     \list
-    \o The \l QAxContainer module is a static
-       library implementing QObject and QWidget subclasses, QAxObject and
-       QAxWidget, that act as containers for COM objects and ActiveX
-       controls.
-    \o The \l QAxServer module is a static library that implements
+    \o The \l{Using ActiveX controls and COM objects in Qt}{QAxContainer}
+       module is a static library implementing QObject and QWidget subclasses,
+       QAxObject and QAxWidget, that act as containers for COM objects and
+       ActiveX controls.
+    \o The \l{Building ActiveX servers and controls with Qt}{QAxServer}
+       module is a static library that implements
        functionality for in-process and executable COM servers. This
        module provides the QAxAggregated, QAxBindable and QAxFactory
        classes.
     \endlist
+
+    A set of \l{Tools for ActiveQt}{tools} is provided to simplify the
+    developing and building of Qt projects that use ActiveX.
 
     To build the static libraries, change into the \c activeqt directory 
Index: trunk/doc/src/getting-started/examples.qdoc
===================================================================
--- trunk/doc/src/getting-started/examples.qdoc	(revision 691)
+++ trunk/doc/src/getting-started/examples.qdoc	(revision 769)
@@ -407,5 +407,5 @@
     \section1 \l{D-Bus Examples}{D-Bus}
     \beginfloatleft
-    \l{D-Bus Examples}{\inlineimage qt-embedded-examples.png
+    \l{D-Bus Examples}{\inlineimage dbus-examples.png
     }
 
@@ -417,5 +417,5 @@
     \section1 \l{Qt for Embedded Linux Examples}{Qt for Embedded Linux}
     \beginfloatleft
-    \l{Qt for Embedded Linux Examples}{\inlineimage dbus-examples.png
+    \l{Qt for Embedded Linux Examples}{\inlineimage qt-embedded-examples.png
     }
 
Index: trunk/doc/src/getting-started/installation.qdoc
===================================================================
--- trunk/doc/src/getting-started/installation.qdoc	(revision 691)
+++ trunk/doc/src/getting-started/installation.qdoc	(revision 769)
@@ -67,10 +67,10 @@
 
 \o  Unpack the archive if you have not done so already. For example,
-    if you have the \c{qt-everywhere-opensource-src-4.6.2.tar.gz}
+    if you have the \c{qt-everywhere-opensource-src-4.6.3.tar.gz}
     package, type the following commands at a command line prompt:
 
 \snippet doc/src/snippets/code/doc_src_installation.qdoc 0
 
-    This creates the directory \c{/tmp/qt-everywhere-opensource-src-4.6.2}
+    This creates the directory \c{/tmp/qt-everywhere-opensource-src-4.6.3}
     containing the files from the archive. We only support the GNU version of
     the tar archiving utility. Note that on some systems it is called gtar.
@@ -82,5 +82,5 @@
 
     By default, Qt is configured for installation in the
-    \c{/usr/local/Trolltech/Qt-4.6.2} directory, but this can be
+    \c{/usr/local/Trolltech/Qt-4.6.3} directory, but this can be
     changed by using the \c{-prefix} option.
 
@@ -134,5 +134,5 @@
     For compilers that do not support rpath you must also extended the
     \c LD_LIBRARY_PATH environment variable to include
-    \c{/usr/local/Trolltech/Qt-4.6.2/lib}. On Linux with GCC this step
+    \c{/usr/local/Trolltech/Qt-4.6.3/lib}. On Linux with GCC this step
     is not needed.
 
@@ -194,5 +194,5 @@
 
 \o  Uncompress the files into the directory you want Qt installed;
-    e.g. \c{C:\Qt\4.6.2}.
+    e.g. \c{C:\Qt\4.6.3}.
 
     \note The install path must not contain any spaces or Windows specific
@@ -206,5 +206,5 @@
 \snippet doc/src/snippets/code/doc_src_installation.qdoc 7
 
-    This is done by adding \c{c:\Qt\4.6.2\bin} to the \c PATH variable.
+    This is done by adding \c{c:\Qt\4.6.3\bin} to the \c PATH variable.
 
     For newer versions of Windows, \c PATH can be extended through
@@ -300,10 +300,10 @@
 
 \o  Unpack the archive if you have not done so already. For example,
-    if you have the \c{qt-everywhere-opensource-src-4.6.2.tar.gz}
+    if you have the \c{qt-everywhere-opensource-src-4.6.3.tar.gz}
     package, type the following commands at a command line prompt:
 
 \snippet doc/src/snippets/code/doc_src_installation.qdoc 11
 
-    This creates the directory \c{/tmp/qt-everywhere-opensource-src-4.6.2}
+    This creates the directory \c{/tmp/qt-everywhere-opensource-src-4.6.3}
     containing the files from the archive.
 
@@ -314,5 +314,5 @@
 
     By default, Qt is configured for installation in the
-    \c{/usr/local/Trolltech/Qt-4.6.2} directory, but this can be
+    \c{/usr/local/Trolltech/Qt-4.6.3} directory, but this can be
     changed by using the \c{-prefix} option.
 
@@ -407,5 +407,5 @@
 \list 1
     \o  Uncompress the files into the directory you want to install Qt into;
-        e.g., \c{C:\Qt\4.6.2}.
+        e.g., \c{C:\Qt\4.6.3}.
 
         \note The install path must not contain any spaces.
@@ -418,5 +418,5 @@
         \snippet doc/src/snippets/code/doc_src_installation.qdoc 18
 
-        This is done by adding \c{c:\Qt\4.6.2\bin} to the \c PATH variable.
+        This is done by adding \c{c:\Qt\4.6.3\bin} to the \c PATH variable.
 
         For newer versions of Windows, \c PATH can be extended through
@@ -507,5 +507,5 @@
     \o  Install Qt
 
-        Run \c{qt-symbian-opensource-4.6.2.exe} and follow the instructions.
+        Run \c{qt-symbian-opensource-4.6.3.exe} and follow the instructions.
 
         \note Qt must be installed on the same drive as the Symbian SDK you are
@@ -587,5 +587,5 @@
 
         Uncompress the \l{http://qt.nokia.com/downloads}{downloaded} source package into the
-        directory you want Qt installed, e.g. \c{C:\Qt\4.6.2}.
+        directory you want Qt installed, e.g. \c{C:\Qt\4.6.3}.
 
         \note Qt must be installed on the same drive as the Symbian SDK you are
@@ -599,5 +599,5 @@
         \snippet doc/src/snippets/code/doc_src_installation.qdoc 18
 
-        This is done by adding \c{c:\Qt\4.6.2\bin} to the \c PATH variable.
+        This is done by adding \c{c:\Qt\4.6.3\bin} to the \c PATH variable.
 
         On Windows the PATH can be extended by navigating to
@@ -755,5 +755,5 @@
     \endlist
 
-    \sa {Known Issues in 4.6.2}
+    \sa {Known Issues in 4.6.3}
 */
 
@@ -765,5 +765,5 @@
     \previouspage General Qt Requirements
 
-    \sa {Known Issues in 4.6.2}
+    \sa {Known Issues in 4.6.3}
 */
 
@@ -904,5 +904,5 @@
     distribution's package repository to find suitable packages.
 
-    \sa {Known Issues in 4.6.2}
+    \sa {Known Issues in 4.6.3}
 */
 
@@ -958,5 +958,5 @@
     \l{Windows CE - Working with Custom SDKs}{here}.
 
-    \sa {Known Issues in 4.6.2}
+    \sa {Known Issues in 4.6.3}
 */
 
@@ -968,5 +968,5 @@
     \previouspage General Qt Requirements
 
-    \sa {Known Issues in 4.6.2}
+    \sa {Known Issues in 4.6.3}
 
     \section1 Building Qt for Embedded Linux with uclibc
@@ -1068,4 +1068,4 @@
     to get more information about how to setup the development environment.
 
-    \sa {Known Issues in 4.6.2}
-*/
+    \sa {Known Issues in 4.6.3}
+*/
Index: trunk/doc/src/getting-started/known-issues.qdoc
===================================================================
--- trunk/doc/src/getting-started/known-issues.qdoc	(revision 691)
+++ trunk/doc/src/getting-started/known-issues.qdoc	(revision 769)
@@ -42,12 +42,12 @@
 /*!
     \page known-issues.html
-    \title Known Issues in 4.6.2
+    \title Known Issues in 4.6.3
     \ingroup platform-specific
-    \brief A summary of known issues in Qt 4.6.2 at the time of release.
+    \brief A summary of known issues in Qt 4.6.3 at the time of release.
 
-    An up-to-date list of known issues with Qt 4.6.2 can be found via the
+    An up-to-date list of known issues with Qt 4.6.3 can be found via the
     \l{http://bugreports.qt.nokia.com/}{Qt Bug Tracker}.
 
-    For a list list of known bugs in Qt 4.6.2, see the \l{Task Tracker}
+    For a list list of known bugs in Qt 4.6.3, see the \l{Task Tracker}
     on the Qt website.
 
Index: trunk/doc/src/howtos/openvg.qdoc
===================================================================
--- trunk/doc/src/howtos/openvg.qdoc	(revision 691)
+++ trunk/doc/src/howtos/openvg.qdoc	(revision 769)
@@ -173,6 +173,23 @@
 
     The other members of QPainter::CompositionMode are not supported
-    because OpenVG 1.1 does not have an equivalent in its \c VGBlendMode
-    enumeration.  Any attempt to set an unsupported mode will result in
+    unless the \c{VG_KHR_advanced_blending} extension is present,
+    in which case the following additional modes are supported:
+
+    \list
+    \o QPainter::CompositionMode_Overlay
+    \o QPainter::CompositionMode_ColorDodge
+    \o QPainter::CompositionMode_ColorBurn
+    \o QPainter::CompositionMode_HardLight
+    \o QPainter::CompositionMode_SoftLight
+    \o QPainter::CompositionMode_Difference
+    \o QPainter::CompositionMode_Exclusion
+    \o QPainter::CompositionMode_SourceOut
+    \o QPainter::CompositionMode_DestinationOut
+    \o QPainter::CompositionMode_SourceAtop
+    \o QPainter::CompositionMode_DestinationAtop
+    \o QPainter::CompositionMode_Xor
+    \endlist
+
+    Any attempt to set an unsupported mode will result in
     the actual mode being set to QPainter::CompositionMode_SourceOver.
     Client applications should avoid using unsupported modes.
@@ -296,4 +313,14 @@
     using OpenVG operations.
 
+    \section2 Scrolling
+
+    By default, accelerated scrolling is not enabled because the impact on
+    performance is very much tied to the hardware platform. To enable
+    accelerated scrolling, you should ensure that QVG_BUFFER_SCROLLING is
+    defined when compiling the QtOpenVG module.
+
+    You should only enable this feature if vgCopyPixels() is known to be
+    efficient on your hardware platform.
+
     \section1 Known issues
 
Index: trunk/doc/src/internationalization/linguist-manual.qdoc
===================================================================
--- trunk/doc/src/internationalization/linguist-manual.qdoc	(revision 691)
+++ trunk/doc/src/internationalization/linguist-manual.qdoc	(revision 769)
@@ -725,5 +725,5 @@
     keyboard accelerators: Alt key and Ctrl key accelerators.
 
-    \section3 Alt Key Accellerators
+    \section3 Alt Key Accelerators
 
     Alt key accelerators are used in menu selection and on buttons.
Index: trunk/doc/src/modules.qdoc
===================================================================
--- trunk/doc/src/modules.qdoc	(revision 691)
+++ trunk/doc/src/modules.qdoc	(revision 769)
@@ -518,4 +518,11 @@
     \l{Open Source Versions of Qt}.
 
+    \section1 Further Links
+
+    General overviews of XQuery and XSchema can be found in the
+    \l{Using XML Technologies} document.
+
+    An introduction to the XQuery language can be found in \l{A Short Path to XQuery}.
+
     \section1 License Information
 
@@ -855,4 +862,6 @@
     \brief The QAxContainer module is a Windows-only extension for
     accessing ActiveX controls and COM objects.
+
+    QAxServer is part of the \l{ActiveQt Framework}.
 
     \section1 License Information
@@ -905,4 +914,6 @@
     \brief The QAxServer module is a Windows-only static library that
     you can use to turn a standard Qt binary into a COM server. 
+
+    QAxServer is part of the \l{ActiveQt Framework}.
 
     \section1 License Information
Index: trunk/doc/src/objectmodel/signalsandslots.qdoc
===================================================================
--- trunk/doc/src/objectmodel/signalsandslots.qdoc	(revision 691)
+++ trunk/doc/src/objectmodel/signalsandslots.qdoc	(revision 769)
@@ -380,5 +380,5 @@
 
     The signatures of signals and slots may contain arguments, and the
-    arguments can have defualt values. Consider QObject::destroyed():
+    arguments can have default values. Consider QObject::destroyed():
 
     \code
Index: trunk/doc/src/platforms/emb-directfb-EmbLinux.qdoc
===================================================================
--- trunk/doc/src/platforms/emb-directfb-EmbLinux.qdoc	(revision 691)
+++ trunk/doc/src/platforms/emb-directfb-EmbLinux.qdoc	(revision 769)
@@ -268,5 +268,6 @@
     \o By default Qt will use DirectFB to load QPixmaps from disk/memory. If
 your DirectFB implementation does not support this it might make sense to
-define this.
+define this. If you see strange rendering issues with pixmaps that have an
+alpha channel defining this could solve the problem.
 
  \row
@@ -328,3 +329,8 @@
 defines should only be used when optimizing the application. 
 
+\section2 Top level transparency
+\note DirectFB supports partially or fully transparent top level windows,
+either through QWidget::setWindowOpacity or through setting a non-opaque
+background brush. Note that for the latter it is not supported to change an
+opaque window to be transparent at runtime.
 */
Index: trunk/doc/src/platforms/emb-features.qdoc
===================================================================
--- trunk/doc/src/platforms/emb-features.qdoc	(revision 691)
+++ trunk/doc/src/platforms/emb-features.qdoc	(revision 769)
@@ -106,7 +106,4 @@
     desktop platforms.
 
-    \bold{Windows CE:} The Qt for Windows CE package contains a \c qconfig
-    executable that you can run on a Windows desktop to configure the build.
-
     \image qt-embedded-qconfigtool.png
 
Index: trunk/doc/src/platforms/emb-install.qdoc
===================================================================
--- trunk/doc/src/platforms/emb-install.qdoc	(revision 691)
+++ trunk/doc/src/platforms/emb-install.qdoc	(revision 769)
@@ -85,8 +85,10 @@
     ./configure script to configure the library for your development
     architecture. You can list all of the configuration system's
-    options by typing \c {./configure -help}.
+    options by typing
+
+    \snippet doc/src/snippets/code/doc_src_emb-install.qdoc embedded help
 
     Note that by default, \l{Qt for Embedded Linux} is configured for
-    installation in the \c{/usr/local/Trolltech/QtEmbedded-4.6.2}
+    installation in the \c{/usr/local/Trolltech/QtEmbedded-4.6.3}
     directory, but this can be changed by using the \c{-prefix}
     option. Alternatively, the \c{-prefix-install} option can be used
@@ -148,5 +150,5 @@
     For compilers that do not support \c rpath you must also extend
     the \c LD_LIBRARY_PATH environment variable to include
-    \c /usr/local/Trolltech/QtEmbedded-4.6.2/lib. Note that on Linux
+    \c /usr/local/Trolltech/QtEmbedded-4.6.3/lib. Note that on Linux
     with GCC, this step is not needed.
 
Index: trunk/doc/src/platforms/emb-openvg.qdocinc
===================================================================
--- trunk/doc/src/platforms/emb-openvg.qdocinc	(revision 691)
+++ trunk/doc/src/platforms/emb-openvg.qdocinc	(revision 769)
@@ -136,6 +136,23 @@
 
 The other members of QPainter::CompositionMode are not supported
-because OpenVG 1.1 does not have an equivalent in its \c VGBlendMode
-enumeration.  Any attempt to set an unsupported mode will result in
+unless the \c{VG_KHR_advanced_blending} extension is present,
+in which case the following additional modes are supported:
+
+\list
+\o QPainter::CompositionMode_Overlay
+\o QPainter::CompositionMode_ColorDodge
+\o QPainter::CompositionMode_ColorBurn
+\o QPainter::CompositionMode_HardLight
+\o QPainter::CompositionMode_SoftLight
+\o QPainter::CompositionMode_Difference
+\o QPainter::CompositionMode_Exclusion
+\o QPainter::CompositionMode_SourceOut
+\o QPainter::CompositionMode_DestinationOut
+\o QPainter::CompositionMode_SourceAtop
+\o QPainter::CompositionMode_DestinationAtop
+\o QPainter::CompositionMode_Xor
+\endlist
+
+Any attempt to set an unsupported mode will result in
 the actual mode being set to QPainter::CompositionMode_SourceOver.
 Client applications should avoid using unsupported modes.
@@ -260,4 +277,10 @@
 accelerated using OpenVG operations.
 
+    \row
+        \o Scrolling
+        \o Accelerated scrolling is implemented but disabled by default
+unless QVG_BUFFER_SCROLLING is defined. This should only be enabled on
+OpenVG engines where vgCopyPixels() is known to be efficient.
+
 \endtable
 
Index: trunk/doc/src/platforms/platform-notes.qdoc
===================================================================
--- trunk/doc/src/platforms/platform-notes.qdoc	(revision 691)
+++ trunk/doc/src/platforms/platform-notes.qdoc	(revision 769)
@@ -251,5 +251,5 @@
     \section1 Windows Vista
 
-    At the time Qt 4.6.2 was released, there were no known Vista-specific issues.
+    At the time Qt 4.6.3 was released, there were no known Vista-specific issues.
 
     \target Windows NT
@@ -420,5 +420,5 @@
 
     Qt for Symbian provides the same level of source compatibility guarantee as
-    given for other platforms. Â That is, a program which compiles against a given
+    given for other platforms. That is, a program which compiles against a given
     version of Qt for Symbian will also compile against all future versions of the
     same major release.
@@ -503,4 +503,32 @@
     \l{Exception Safety with Symbian}.
 
+    \section1 Required Capabilities
+
+    The Qt libraries are typically signed with \c{All -TCB} capabilites, but
+    that does not mean your Qt application needs to be signed with the same
+    capabilities to function properly. The capabilities your application needs
+    to function properly depends on which parts of Qt you use, here is an
+    overview:
+
+    \table
+    \header \o Module
+            \o Required Symbian Capability
+    \row    \o QtCore
+            \o \c PowerMgmt if QProcess::kill(...) or QProcess::terminate(...) is called.
+    \row    \o QtCore
+            \o \c AllFiles when \l{http://developer.symbian.org/wiki/index.php/Capabilities_%28Symbian_Signed%29/AllFiles_Capability}{accessing specific areas.}
+    \row    \o QtNetwork
+            \o \c NetworkServices is basically always required for this module.
+    \row    \o QtMultiMedia
+            \o \c UserEnvironment if QAudioInput is used.
+    \endtable
+
+    Note that some modules rely on other modules. If your application uses
+    QtXmlPatterns, QtWebkit or QtScript it may still require \c NetworkServices
+    \o as these modules rely on QtNetwork to go online.
+
+    For more information see the documentation of the individual Qt classes. If
+    a class does not mention Symbian capabilities, it requires none.
+
     \section1 Multimedia and Phonon Support
 
Index: trunk/doc/src/platforms/supported-platforms.qdoc
===================================================================
--- trunk/doc/src/platforms/supported-platforms.qdoc	(revision 691)
+++ trunk/doc/src/platforms/supported-platforms.qdoc	(revision 769)
@@ -117,5 +117,5 @@
     \row    \o HPUXi 11.23
                                      \o aCC 6.10
-    \row    \o Solaris 10 UltraSparc
+    \row    \o Solaris 10 (UltraSparc, x86)
                                      \o Sun Studio 12
     \row    \o AIX 6
Index: trunk/doc/src/platforms/symbian-introduction.qdoc
===================================================================
--- trunk/doc/src/platforms/symbian-introduction.qdoc	(revision 691)
+++ trunk/doc/src/platforms/symbian-introduction.qdoc	(revision 769)
@@ -133,4 +133,6 @@
                                 missing dependencies in addition to
                                 just installing the application.
+    \row \o \c stub_sis      \o Create a stub sis to allow upgradability of projects
+                                that are deployed in ROM
     \endtable
 
Index: trunk/doc/src/platforms/wince-customization.qdoc
===================================================================
--- trunk/doc/src/platforms/wince-customization.qdoc	(revision 691)
+++ trunk/doc/src/platforms/wince-customization.qdoc	(revision 769)
@@ -214,5 +214,5 @@
     \o The shadow build directory must be on the same level as the Qt source
         package.\br
-    If the Qt package is in \c{C:\Qt\4.6.2} the shadow build directory
+    If the Qt package is in \c{C:\Qt\4.6.3} the shadow build directory
     could be \c{C:\Qt\shadowbuild}. A shadow build from a directory like
     \c{C:\shadowbuild} will not compile.
@@ -225,5 +225,5 @@
     \endlist
 
-    So lets assume you have installed Qt in \c{C:\Qt\4.6.2} and you want
+    So lets assume you have installed Qt in \c{C:\Qt\4.6.3} and you want
     to create a shadow build in \c{C:\Qt\mobile5-shadow}:
 
Index: trunk/doc/src/porting/porting4.qdoc
===================================================================
--- trunk/doc/src/porting/porting4.qdoc	(revision 691)
+++ trunk/doc/src/porting/porting4.qdoc	(revision 769)
@@ -3202,6 +3202,6 @@
     The \c QShared class has been obsoleted by the more powerful
     QSharedData and QSharedDataPointer as a means of creating custom
-    implicitly shared classes. It has been renamed Q3Shared moved to
-    the Qt3Support library.
+    implicitly shared classes. It has been renamed Q3Shared and moved
+    to the Qt3Support library.
 
     An easy way of porting to Qt 4 is to include this class into your
@@ -3227,5 +3227,5 @@
 
     QSimpleRichText has been obsoleted by QTextDocument. It has
-    bene renamed Q3SimpleRichText and moved to the Qt3Support
+    been renamed Q3SimpleRichText and moved to the Qt3Support
     library.
 
Index: trunk/doc/src/porting/qt4-network.qdoc
===================================================================
--- trunk/doc/src/porting/qt4-network.qdoc	(revision 691)
+++ trunk/doc/src/porting/qt4-network.qdoc	(revision 769)
@@ -200,5 +200,5 @@
     eliminated. These classes attempted the impossible (unify FTP and
     HTTP under one roof), and unsurprisingly failed at that. Qt 4
-    still provides QFtp, and it also proveds the QNetworkAccessManager.
+    still provides QFtp, and it also provides the QNetworkAccessManager.
 
     The QSocket class in Qt 3 has been renamed QTcpSocket. The new
Index: trunk/doc/src/qt4-intro.qdoc
===================================================================
--- trunk/doc/src/qt4-intro.qdoc	(revision 691)
+++ trunk/doc/src/qt4-intro.qdoc	(revision 769)
@@ -469,10 +469,10 @@
     included in the \c changes-4.6.0 file
     \l{http://qt.nokia.com/developer/changes/changes-4.6.0}{available
-    online}. A \l{Known Issues in 4.6.2}{list of known issues}
+    online}. A \l{Known Issues in 4.6.3}{list of known issues}
     for this release is also available.
 
     Changes between this release and the previous release are provided
-    in the \c{changes-4.6.2} file (also
-    \l{http://qt.nokia.com/developer/changes/changes-4.6.2}{available online}).
+    in the \c{changes-4.6.3} file (also
+    \l{http://qt.nokia.com/developer/changes/changes-4.6.3}{available online}).
 \endomit
 
@@ -683,10 +683,10 @@
     in the \c changes-4.5.0 file
     \l{http://qt.nokia.com/developer/changes/changes-4.5.0}{available online}.
-    A \l{Known Issues in 4.6.2}{list of known issues} for this release is also
+    A \l{Known Issues in 4.6.3}{list of known issues} for this release is also
     available.
 
     Changes between this release and the previous release are provided
-    in the \c{changes-4.6.2} file (also
-    \l{http://qt.nokia.com/developer/changes/changes-4.6.2}{available online}).
+    in the \c{changes-4.6.3} file (also
+    \l{http://qt.nokia.com/developer/changes/changes-4.6.3}{available online}).
 
     A list of other Qt 4 features can be found on the
Index: trunk/doc/src/scripting/scripting.qdoc
===================================================================
--- trunk/doc/src/scripting/scripting.qdoc	(revision 691)
+++ trunk/doc/src/scripting/scripting.qdoc	(revision 769)
@@ -1008,5 +1008,5 @@
   implementing functions that take a variable number of arguments
   is simple. In fact, as we have seen, in the technical sense \e{all}
-  Qt Script functions can be seen as variable-argument functions).
+  Qt Script functions can be seen as variable-argument functions.
   As an example, consider a concat() function that takes an arbitrary
   number of arguments, converts the arguments to their string
Index: trunk/doc/src/snippets/code/doc_src_deployment.qdoc
===================================================================
--- trunk/doc/src/snippets/code/doc_src_deployment.qdoc	(revision 691)
+++ trunk/doc/src/snippets/code/doc_src_deployment.qdoc	(revision 769)
@@ -464,5 +464,6 @@
     ":\"Example Vendor\""
 
-default_deployment.pkg_prerules = vendorinfo
+my_deployment.pkg_prerules = vendorinfo
+DEPLOYMENT += my_deployment
 //! [56]
 
@@ -472,5 +473,7 @@
     "[0x1028315F],0,0,0,{\"S60ProductID\"}"
 
-default_deployment.pkg_prerules += supported_platforms
+default_deployment.pkg_prerules -= pkg_platform_dependencies
+my_deployment.pkg_prerules += supported_platforms
+DEPLOYMENT += my_deployment
 //! [57]
 
Index: trunk/doc/src/snippets/code/doc_src_emb-install.qdoc
===================================================================
--- trunk/doc/src/snippets/code/doc_src_emb-install.qdoc	(revision 691)
+++ trunk/doc/src/snippets/code/doc_src_emb-install.qdoc	(revision 769)
@@ -42,16 +42,20 @@
 //! [0]
 cd <anywhere>
-gunzip qt-embedded-linux-commercial-src-4.6.2.tar.gz
-tar xf qt-embedded-linux-commercial-src-4.6.2.tar
+gunzip qt-everywhere-opensource-src-4.6.3.tar.gz
+tar xf qt-everywhere-opensource-src-4.6.3.tar
 //! [0]
 
 
 //! [1]
-~/qt-embedded-linux-commercial-src-4.6.2
+~/qt-everywhere-opensource-src-4.6.3
 //! [1]
 
 
+//! [embedded help]
+./configure -embedded -help
+//! [embedded help]
+
 //! [2]
-cd  ~/qt-embedded-linux-commercial-src-4.6.2
+cd  ~/qt-everywhere-opensource-src-4.6.3
 ./configure -embedded [architecture]
 //! [2]
@@ -69,5 +73,5 @@
 
 //! [5]
-PATH=/usr/local/Trolltech/QtEmbedded-4.6.2/bin:$PATH
+PATH=/usr/local/Trolltech/QtEmbedded-4.6.3/bin:$PATH
 export PATH
 //! [5]
@@ -75,4 +79,4 @@
 
 //! [6]
-setenv PATH /usr/local/Trolltech/QtEmbedded-4.6.2/bin:$PATH
+setenv PATH /usr/local/Trolltech/QtEmbedded-4.6.3/bin:$PATH
 //! [6]
Index: trunk/doc/src/snippets/code/doc_src_installation.qdoc
===================================================================
--- trunk/doc/src/snippets/code/doc_src_installation.qdoc	(revision 691)
+++ trunk/doc/src/snippets/code/doc_src_installation.qdoc	(revision 769)
@@ -42,11 +42,11 @@
 //! [0]
 cd /tmp
-gunzip qt-everywhere-opensource-src-4.6.2.tar.gz        # uncompress the archive
-tar xvf qt-everywhere-opensource-src-4.6.2.tar          # unpack it
+gunzip qt-everywhere-opensource-src-4.6.3.tar.gz        # uncompress the archive
+tar xvf qt-everywhere-opensource-src-4.6.3.tar          # unpack it
 //! [0]
 
 
 //! [1]
-cd /tmp/qt-everywhere-opensource-src-4.6.2
+cd /tmp/qt-everywhere-opensource-src-4.6.3
 ./configure
 //! [1]
@@ -69,5 +69,5 @@
 
 //! [5]
-PATH=/usr/local/Trolltech/Qt-4.6.2/bin:$PATH
+PATH=/usr/local/Trolltech/Qt-4.6.3/bin:$PATH
 export PATH
 //! [5]
@@ -75,5 +75,5 @@
 
 //! [6]
-setenv PATH /usr/local/Trolltech/Qt-4.6.2/bin:$PATH
+setenv PATH /usr/local/Trolltech/Qt-4.6.3/bin:$PATH
 //! [6]
 
@@ -86,5 +86,5 @@
 //! [8]
 C:
-cd /D C:\Qt\4.6.2
+cd /D C:\Qt\4.6.3
 configure
 //! [8]
@@ -103,11 +103,11 @@
 //! [11]
 cd /tmp
-gunzip qt-everywhere-opensource-src-4.6.2.tar.gz        # uncompress the archive
-tar xvf qt-everywhere-opensource-src-4.6.2.tar          # unpack it
+gunzip qt-everywhere-opensource-src-4.6.3.tar.gz        # uncompress the archive
+tar xvf qt-everywhere-opensource-src-4.6.3.tar          # unpack it
 //! [11]
 
 
 //! [12]
-cd /tmp/qt-everywhere-opensource-src-4.6.2
+cd /tmp/qt-everywhere-opensource-src-4.6.3
 ./configure
 //! [12]
@@ -130,5 +130,5 @@
 
 //! [16]
-PATH=/usr/local/Trolltech/Qt-4.6.2/bin:$PATH
+PATH=/usr/local/Trolltech/Qt-4.6.3/bin:$PATH
 export PATH
 //! [16]
@@ -136,5 +136,5 @@
 
 //! [17]
-setenv PATH /usr/local/Trolltech/Qt-4.6.2/bin:$PATH
+setenv PATH /usr/local/Trolltech/Qt-4.6.3/bin:$PATH
 //! [17]
 
@@ -147,5 +147,5 @@
 //! [19]
 C:
-cd \Qt\4.6.2
+cd \Qt\4.6.3
 configure -platform win32-msvc2005 -xplatform wincewm50pocket-msvc2005
 //! [19]
@@ -170,5 +170,5 @@
 
 //! [23]
-cd \Qt\4.6.2
+cd \Qt\4.6.3
 configure -platform win32-g++ -xplatform symbian-abld
 //! [23]
@@ -209,5 +209,5 @@
 
 //! [31]
-cd \Qt\4.6.2
+cd \Qt\4.6.3
 configure -platform win32-g++ -xplatform symbian-sbsv2
 //! [31]
Index: trunk/doc/src/snippets/code/doc_src_porting4.qdoc
===================================================================
--- trunk/doc/src/snippets/code/doc_src_porting4.qdoc	(revision 691)
+++ trunk/doc/src/snippets/code/doc_src_porting4.qdoc	(revision 769)
@@ -453,5 +453,5 @@
 richText.setWidth(w);
 
-// Or set a resonable default size
+// Or set a reasonable default size
 richText.adjustSize();
 
Index: trunk/doc/src/snippets/code/doc_src_qmake-manual.qdoc
===================================================================
--- trunk/doc/src/snippets/code/doc_src_qmake-manual.qdoc	(revision 691)
+++ trunk/doc/src/snippets/code/doc_src_qmake-manual.qdoc	(revision 769)
@@ -934,5 +934,7 @@
 
 //! [141]
-default_deployment.pkg_prerules = "[0x11223344],0,0,0,{\"SomeSpecificDeviceID\"}"
+default_deployment.pkg_prerules -= pkg_platform_dependencies
+my_deployment.pkg_prerules = "[0x11223344],0,0,0,{\"SomeSpecificDeviceID\"}"
+DEPLOYMENT += my_deployment
 //! [141]
 
@@ -970,2 +972,34 @@
 DEPLOYMENT.installer_header = "$${LITERAL_HASH}{\"My Application Installer\"},(0x12345678),1,0,0"
 //! [147]
+
+//! [148]
+# Set conditional libraries
+LIB.MARM = "LIBRARY myarm.lib"
+LIB.WINSCW = "LIBRARY mywinscw.lib"
+LIB.default = "LIBRARY mydefault.lib"
+
+# Add the conditional MMP rules
+MYCONDITIONS = MARM WINSCW
+MYVARIABLES = LIB
+
+addMMPRules(MYCONDITIONS, MYVARIABLES)
+//! [148]
+
+//! [149]
+SUBDIRS += my_executable my_library
+my_executable.subdir = app
+my_executable.depends = my_library
+my_library.subdir = lib
+//! [149]
+
+//! [150]
+symbian {
+    SUBDIRS += emulator_dll
+    emulator_dll.condition = WINSCW
+}
+//! [150]
+
+//! [151]
+RSS_RULES.service_list += "uid = 0x12345678; datatype_list = \{\}; opaque_data = r_my_icon;"
+RSS_RULES.footer +="RESOURCE CAPTION_AND_ICON_INFO r_my_icon \{ icon_file =\"$$PWD/my_icon.svg\"; \}"
+//! [151]
Index: trunk/doc/src/snippets/code/doc_src_qtestlib.qdoc
===================================================================
--- trunk/doc/src/snippets/code/doc_src_qtestlib.qdoc	(revision 691)
+++ trunk/doc/src/snippets/code/doc_src_qtestlib.qdoc	(revision 769)
@@ -111,5 +111,5 @@
 //! [10]
 ********* Start testing of TestQString *********
-Config: Using QTest library 4.6.2, Qt 4.6.2
+Config: Using QTest library 4.6.3, Qt 4.6.3
 PASS   : TestQString::initTestCase()
 PASS   : TestQString::toUpper()
Index: trunk/doc/src/snippets/code/doc_src_wince-customization.qdoc
===================================================================
--- trunk/doc/src/snippets/code/doc_src_wince-customization.qdoc	(revision 691)
+++ trunk/doc/src/snippets/code/doc_src_wince-customization.qdoc	(revision 769)
@@ -63,5 +63,5 @@
 //! [4]
 cd c:\Qt\mobile5-shadow
-C:\Qt\4.6.2\configure.exe -platform win32-msvc2005 -xplatform wincewm50pocket-msvc2005 -release
+C:\Qt\4.6.3\configure.exe -platform win32-msvc2005 -xplatform wincewm50pocket-msvc2005 -release
 //! [4]
 
Index: trunk/doc/src/snippets/code/src_corelib_kernel_qobject.cpp
===================================================================
--- trunk/doc/src/snippets/code/src_corelib_kernel_qobject.cpp	(revision 691)
+++ trunk/doc/src/snippets/code/src_corelib_kernel_qobject.cpp	(revision 769)
@@ -375,8 +375,11 @@
            [WRITE setFunction]
            [RESET resetFunction]
+           [NOTIFY notifySignal]
            [DESIGNABLE bool]
            [SCRIPTABLE bool]
            [STORED bool]
-	   [USER bool])
+	   [USER bool]
+           [CONSTANT]
+           [FINAL])
 //! [36]
 
Index: trunk/doc/src/snippets/code/src_corelib_tools_qscopedpointer.cpp
===================================================================
--- trunk/doc/src/snippets/code/src_corelib_tools_qscopedpointer.cpp	(revision 691)
+++ trunk/doc/src/snippets/code/src_corelib_tools_qscopedpointer.cpp	(revision 769)
@@ -129,5 +129,5 @@
 
 // this QScopedPointer frees its data using free():
-QScopedPointer<int, QScopedPointerPodDeleter<int> > podPointer(reinterpret_cast<int *>(malloc(42)));
+QScopedPointer<int, QScopedPointerPodDeleter> podPointer(reinterpret_cast<int *>(malloc(42)));
 
 // this struct calls "myCustomDeallocator" to delete the pointer
Index: trunk/doc/src/widgets-and-layouts/styles.qdoc
===================================================================
--- trunk/doc/src/widgets-and-layouts/styles.qdoc	(revision 691)
+++ trunk/doc/src/widgets-and-layouts/styles.qdoc	(revision 769)
@@ -126,5 +126,5 @@
     QStyle draw widgets without linking in any code for the widget. This
     makes it possible to use \l{QStyle}'s draw functions on any paint
-    device. Ie you can draw a combobox on any widget, not just on a
+    device, i.e., you can draw a combobox on any widget, not just on a
     QComboBox.
 
Index: trunk/doc/src/widgets-and-layouts/stylesheet.qdoc
===================================================================
--- trunk/doc/src/widgets-and-layouts/stylesheet.qdoc	(revision 691)
+++ trunk/doc/src/widgets-and-layouts/stylesheet.qdoc	(revision 769)
@@ -3823,5 +3823,5 @@
     \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 148
 
-    Sine Qt 4.6 the close button can be customized as follow:
+    Since Qt 4.6 the close button can be customized as follow:
     \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 159
 
Index: trunk/doc/src/windows-and-dialogs/mainwindow.qdoc
===================================================================
--- trunk/doc/src/windows-and-dialogs/mainwindow.qdoc	(revision 691)
+++ trunk/doc/src/windows-and-dialogs/mainwindow.qdoc	(revision 769)
@@ -52,5 +52,5 @@
     \nextpage The Application Main Window
 
-    A \l{Widgets}{widget} that is not embedded in a parent widget is called a window.
+    A \l{Widgets Tutorial}{widget} that is not embedded in a parent widget is called a window.
     Usually, windows have a frame and a title bar, although it is also possible to create
     windows without such decoration using suitable window flags). In Qt, QMainWindow
