Changeset 846 for trunk/doc/src/platforms

trunk

Property svn:mergeinfo changed
/branches/vendor/nokia/qt/4.7.2 (added) merged: 845
/branches/vendor/nokia/qt/current merged: 844
/branches/vendor/nokia/qt/4.6.3 removed

trunk/doc/src/platforms/atomic-operations.qdoc

-              r651
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** 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:LGPL$
+** $QT_BEGIN_LICENSE:FDL$
 ** Commercial Usage
 ** Licensees holding valid Qt Commercial licenses may use this file in
 ** accordance with the Qt Commercial License Agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and Nokia.
+** Software or, alternatively, in accordance with the terms contained in a
+** written agreement between you and Nokia.
 **
+** 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.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+** 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

trunk/doc/src/platforms/compiler-notes.qdoc

-              r651
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** 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:LGPL$
+** $QT_BEGIN_LICENSE:FDL$
 ** Commercial Usage
 ** Licensees holding valid Qt Commercial licenses may use this file in
 ** accordance with the Qt Commercial License Agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and Nokia.
+** Software or, alternatively, in accordance with the terms contained in a
+** written agreement between you and Nokia.
 **
+** 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.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+** 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
 …
     \brief Information about the C++ compilers and tools used to build Qt.
+    This page contains information about the C++ compilers and tools used
+    to build Qt on various platforms.
+    This page used to contain information about the C++ compilers and tools
+    used to build Qt on various platforms. This information is now maintained
+    in the \l{Platform and Compiler Notes} for each platform.
+    \tableofcontents
+    Please refer to the \l{Platform Notes} for information on the platforms
+    Qt is currently known to run on, and see the \l{Supported Platforms}
+    page for information about the status of each platform.
+    Please refer to the \l{Supported Platforms} page for information about the
+    status of each platform.
     If you have anything to add to this list or any of the platform or
     compiler-specific pages, please submit it via the \l{Bug Report Form}
     or through the \l{Public Qt Repository}.
-    \section1 Supported Features
-    Not all compilers used to build Qt are able to compile all modules. The following table
-    shows the compiler support for five modules that are not uniformly available for all
-    platforms and compilers.
-    \table
-    \header \o Compiler \o{5,1} Features
-    \header \o                  \o Concurrent \o XmlPatterns \o WebKit   \o CLucene  \o Phonon
-    \row    \o g++ 3.3          \o            \o \bold{X}    \o          \o \bold{X} \o \bold{X}
-    \row    \o g++ 3.4 and up   \o \bold{X}   \o \bold{X}    \o \bold{X} \o \bold{X} \o \bold{X}
-    \row
-    \row    \o SunCC 5.5        \o            \o             \o          \o \bold{X} \o \bold{X}
-    \row
-    \row    \o aCC series 3     \o            \o             \o          \o \bold{X} \o \bold{X}
-    \row    \o aCC series 6     \o \bold{X}   \o \bold{X}    \o \bold{X} \o \bold{X} \o \bold{X}
-    \row    \o xlC 6            \o            \o             \o          \o \bold{X} \o \bold{X}
-    \row    \o Intel CC 10      \o \bold{X}   \o \bold{X}    \o \bold{X} \o \bold{X} \o \bold{X}
-    \row
-    \row    \o MSVC 2003        \o \bold{X}   \o \bold{X}    \o          \o \bold{X} \o \bold{X}
-    \row    \o MSVC 2005 and up \o \bold{X}   \o \bold{X}    \o \bold{X} \o \bold{X} \o \bold{X}
-    \endtable
-    \target GCC
-    \section1 GCC
-    \section2 GCC on Windows (MinGW)
-    We have tested Qt with this compiler on Windows XP.
-    The minimal version of MinGW supported is:
-    \list
-    \o GCC 3.4.2
-    \o MinGW runtime 3.7
-    \o win32api 3.2
-    \o binutils 2.15.91
-    \o mingw32-make 3.80.0-3
-    \endlist
-    \note For users of the MinGW binary package: This package is now
-    based on MinGW 4.4. The installer no longer offers to download
-    MinGW for you, but rather offers to use a version of MinGW that
-    you already have installed on your machine. You just tell the
-    installer which directory MinGW is installed in. If you don't
-    already have MinGW 4.4 installed, you can download a .zip archive
-    from our \l{ftp://ftp.trolltech.com/misc/MinGW-gcc440_1.zip} {ftp
-    site}. This archive provides fixes to MinGW and support for
-    missing API, See the _patches directory in the archive for
-    details.
-    \note A MinGW installation is only needed to build against the
-    binary pacakge, not to run the pre-compiled binaries that are in
-    the package.
-    \section2 GCC 4.0.0
-    The released package of the compiler has some bugs that lead to
-    miscompilations.  We recommend using GCC 4.0.1 or later, or to use
-    a recent CVS snapshot of the GCC 4.0 branch. The version of GCC
-.0.0 that is shipped with Mac OS X 10.4 "Tiger" is known to work
-    with Qt for Mac OS X.
-    \section2 HP-UX
-    The hpux-g++ platform is tested with GCC 3.4.4.
-    \section2 Solaris
-    Please use GCC 3.4.2 or later.
-    \section2 Mac OS X
-    Please use the latest GCC 3.3 from Apple or a later version of GCC 3.
-    The gcc 3.3 that is provided with Xcode 1.5 is known to generate bad code.
-    Use the November 2004 GCC 3.3 updater \l{http://connect.apple.com}{available from Apple}.
-    \section2 GCC 3.4.6 (Debian 3.4.6-5) on AMD64 (x86_64)
-    This compiler is known to miscompile some parts of Qt when doing a
-    release build. There are several workarounds:
-    \list 1
-    \o Use a debug build instead.
-    \o For each miscompilation encountered, recompile the file, removing the -O2 option.
-    \o Add -fno-gcse to the QMAKE_CXXFLAGS_RELEASE.
-    \endlist
-    \section1 HP ANSI C++ (aCC)
-    The hpux-acc-32 and hpux-acc-64 platforms are tested with aCC A.03.57. The
-    hpuxi-acc-32 and hpuxi-acc-64 platforms are tested with aCC A.06.10.
-    \section1 Intel C++ Compiler
-    Qt supports the Intel C++ compiler on both Windows and Linux.
-    However, there are a few issues on Linux (see the following
-    section).
-    \section2 Intel C++ Compiler for Linux
-    Nokia currently tests the following compilers:
-    \list
-    \o Intel(R) C++ Compiler for applications running on IA-32,
-    Version 10.1 Build 20080602 Package ID: l_cc_p_10.1.017
-    \o Intel(R) C++ Compiler for applications running on Intel(R) 64,
-    Version 10.1 Build 20080602 Package ID: l_cc_p_10.1.017
-    \endlist
-    We do not currently test the IA-64 (Itanium) compiler.
-    \section2 Known Issues with Intel C++ Compiler for Linux
-    \list
-    \o Precompiled header support does not work in version 10.0.025
-       and older. For these compilers, you should configure Qt with
-       -no-pch. Precompiled header support works properly in version
-.0.026 and later.
-    \o Version 10.0.026 for Intel 64 is known to miscompile qmake when
-       building in release mode. For now, configure Qt with
-       -debug. Version 10.1.008 and later can compile qmake in release
-       mode.
-    \o Versions 10.1.008 to 10.1.015 for both IA-32 and Intel 64 are
-       known crash with "(0): internal error: 0_47021" when compiling
-       QtXmlPatterns, QtWebKit, and Designer in release mode. Version
-.1.017 compiles these modules correctly in release mode.
-    \endlist
-    \section2 Intel C++ Compiler (Windows, Altix)
-    Qt 4 has been tested successfully with:
-    \list
-    \o Windows - Intel(R) C++ Compiler for 32-bit applications,
-       Version 9.1.040.
-    \o Altix - Intel(R) C++ Itanium(R) Compiler for Itanium(R)-based
-       applications Version 8.1 Build 20050406 Package ID: l_cc_pc_8.1.030
-    \endlist
-    We currently only test the Intel compiler on 32-bit Windows versions.
-    \section1 MIPSpro (IRIX)
-    \bold{IRIX is an unsupported platform. See the \l{Supported Platforms} page
-    and Qt's Software's online \l{Platform Support Policy} page for details.}
-    Qt 4.4.x requires MIPSpro version 7.4.2m.
-    Note that MIPSpro version 7.4.4m is currently not supported, since it has
-    introduced a number of problems that have not yet been resolved.
-    We recommend using 7.4.2m for Qt development. However, please note the
-    unsupported status of this platform.
-    \target Sun Studio
-    \section1 Forte Developer / Sun Studio (Solaris)
-    \section2 Sun Studio
-    Qt is tested using Sun Studio 12 (Sun CC 5.9). Go to
-    \l{Sun Studio Patches} page on Sun's Web site to download
-    the latest patches for your Sun compiler.
-    Please note that Qt 4.6 is stricter in its STL requirements and
-    that the default STL implementation used by Sun CC does not pass
-    those requirements. This does not affect binary compatibility and
-    you can continue to use STL in your own code, but Qt's
-    STL-compatibility functions will be disabled.
-    Sun CC ships with a secondary STL implementation (called stlport4)
-    which is standards-compliant and can be used by Qt. You can enable
-    it by passing the -library=stlport4 option to the compiler. Note
-    that this does not affect Qt's binary compatibility, but it may
-    affect that of other libraries and programs that use STL.
-    \section2 Sun WorkShop 5.0
-    Sun WorkShop 5.0 is not supported with Qt 4.
-    \section1 Visual Studio (Windows)
-    We do most of our Windows development on Windows XP, using Microsoft
-    Visual Studio .NET 2005 and Visual Studio 2008 (both the 32- and 64-bit
-    versions).
-    Qt works with the Standard Edition, the Professional Edition and Team
-    System Edition of Visual Studio 2005.
-    We also test Qt 4 on Windows XP with Visual Studio .NET and Visual Studio 2003.
-    In order to use Qt with the Visual Studio 2005/2008 Express Edition you need
-    to download and install the platform SDK. Due to limitations in the
-    Express Edition it is not possible for us to install the Qt Visual
-    Studio Integration. You will need to use our command line tools to
-    build Qt applications with this edition.
-    The Visual C++ Linker doesn't understand filenames with spaces (as in
-    \c{C:\Program files\Qt\}) so you will have to move it to another place,
-    or explicitly set the path yourself; for example:
-    \snippet doc/src/snippets/code/doc_src_compiler-notes.qdoc 0
-    If you are experiencing strange problems with using special flags that
-    modify the alignment of structure and union members (such as \c{/Zp2})
-    then you will need to recompile Qt with the flags set for the
-    application as well.
-    If you're using Visual Studio .NET (2002) Standard Edition, you should be
-    using the Qt binary package provided, and not the source package.
-    As the Standard Edition does not optimize compiled code, your compiled
-    version of Qt would perform suboptimally with respect to speed.
-    With Visual Studio 2005 Service Pack 1 a bug was introduced which
-    causes Qt not to compile, this has been fixed with a hotfix available
-    from Microsoft. See this
-    \l{http://qt.nokia.com/developer/faqs/faq.2006-12-18.3281869860}{Knowledge Base entry}
-    for more information.
-    \section1 IBM xlC (AIX)
-    The makeC++SharedLib utility must be in your PATH and be up to date to
-    build shared libraries. From IBM's
-    \l{http://www.redbooks.ibm.com/abstracts/sg245674.html}{C and C++ Application Development on AIX}
-    Redbook:
-    \list
-    \o "The second step is to use the makeC++SharedLib command to create the
-       shared object. The command has many optional arguments, but in its
-       simplest form, can be used as follows:"
-       \snippet doc/src/snippets/code/doc_src_compiler-notes.qdoc 1
-    \o "The full path name to the command is not required; however, to avoid
-       this, you will have to add the directory in which it is located to
-       your PATH environment variable. The command is located in the
-       /usr/vacpp/bin directory with the VisualAge C++ Professional for AIX,
-       Version 5 compiler."
-    \endlist
-    \section2 VisualAge C++ for AIX, Version 6.0
-    Make sure you have the
-    \l{http://www-1.ibm.com/support/search.wss?rs=32&amp;tc=SSEP5D&amp;dc=D400}{latest upgrades}
-    installed.
-    \section2 GCCE (Symbian)
-    GCCE cannot be used to compile Qt libaries for the Symbian platform, but GCCE is supported
-    when compiling Qt applications for Symbian platform.
 */

trunk/doc/src/platforms/emb-HwAcc-LinuxEmbedded.qdoc

-              r651
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** 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:LGPL$
+** $QT_BEGIN_LICENSE:FDL$
 ** Commercial Usage
 ** Licensees holding valid Qt Commercial licenses may use this file in
 ** accordance with the Qt Commercial License Agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and Nokia.
+** Software or, alternatively, in accordance with the terms contained in a
+** written agreement between you and Nokia.
 **
+** 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.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+** 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

trunk/doc/src/platforms/emb-HwAcc-WinCE.qdoc

-              r651
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** 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:LGPL$
+** $QT_BEGIN_LICENSE:FDL$
 ** Commercial Usage
 ** Licensees holding valid Qt Commercial licenses may use this file in
 ** accordance with the Qt Commercial License Agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and Nokia.
+** Software or, alternatively, in accordance with the terms contained in a
+** written agreement between you and Nokia.
 **
+** 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.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+** 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

trunk/doc/src/platforms/emb-accel.qdoc

-              r651
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** 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:LGPL$
+** $QT_BEGIN_LICENSE:FDL$
 ** Commercial Usage
 ** Licensees holding valid Qt Commercial licenses may use this file in
 ** accordance with the Qt Commercial License Agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and Nokia.
+** Software or, alternatively, in accordance with the terms contained in a
+** written agreement between you and Nokia.
 **
+** 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.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+** 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

trunk/doc/src/platforms/emb-architecture.qdoc

-              r651
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** 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:LGPL$
+** $QT_BEGIN_LICENSE:FDL$
 ** Commercial Usage
 ** Licensees holding valid Qt Commercial licenses may use this file in
 ** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** 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.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+** Software or, alternatively, in accordance with the terms contained in a
+** written agreement between you and Nokia.
+**
+** 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

trunk/doc/src/platforms/emb-charinput.qdoc

-              r651
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** 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:LGPL$
+** $QT_BEGIN_LICENSE:FDL$
 ** Commercial Usage
 ** Licensees holding valid Qt Commercial licenses may use this file in
 ** accordance with the Qt Commercial License Agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and Nokia.
+** Software or, alternatively, in accordance with the terms contained in a
+** written agreement between you and Nokia.
 **
+** 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.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+** 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

trunk/doc/src/platforms/emb-crosscompiling.qdoc

-              r651
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** 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:LGPL$
+** $QT_BEGIN_LICENSE:FDL$
 ** Commercial Usage
 ** Licensees holding valid Qt Commercial licenses may use this file in
 ** accordance with the Qt Commercial License Agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and Nokia.
+** Software or, alternatively, in accordance with the terms contained in a
+** written agreement between you and Nokia.
 **
+** 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.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+** 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

trunk/doc/src/platforms/emb-deployment.qdoc

-              r651
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** 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:LGPL$
+** $QT_BEGIN_LICENSE:FDL$
 ** Commercial Usage
 ** Licensees holding valid Qt Commercial licenses may use this file in
 ** accordance with the Qt Commercial License Agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and Nokia.
+** Software or, alternatively, in accordance with the terms contained in a
+** written agreement between you and Nokia.
 **
+** 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.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+** 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
 …
     when running the \c configure script; ensure that this is a
     sensible path in the target device environment. See the
     \l {Installing Qt on Embedded Linux#Step 3: Building the
+    \l {Installing Qt for Embedded Linux#Step 3: Building the
     Library}{installation} documentation for more details.

trunk/doc/src/platforms/emb-differences.qdoc

-              r651
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** 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:LGPL$
+** $QT_BEGIN_LICENSE:FDL$
 ** Commercial Usage
 ** Licensees holding valid Qt Commercial licenses may use this file in
 ** accordance with the Qt Commercial License Agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and Nokia.
+** Software or, alternatively, in accordance with the terms contained in a
+** written agreement between you and Nokia.
 **
+** 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.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+** 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

trunk/doc/src/platforms/emb-directfb-EmbLinux.qdoc

-              r769
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** 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:LGPL$
+** $QT_BEGIN_LICENSE:FDL$
 ** Commercial Usage
 ** Licensees holding valid Qt Commercial licenses may use this file in
 ** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** 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.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+** Software or, alternatively, in accordance with the terms contained in a
+** written agreement between you and Nokia.
+**
+** 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
 …
 supports.
 We recommend using Qt 4.6 with DirectFB. DirectFB support was introduced
 already into Qt for Embedded Linux as a labs project for Qt 4.3 and folded
+We recommend using Qt 4.6 or later with DirectFB. Support for DirectFB was
+introduced into Qt for Embedded Linux as a labs project for Qt 4.3 and folded
 into Qt as a screen driver for Qt 4.4, but not supported fully. In Qt 4.5,
 major changes were made to make it work with the optimized raster paint
 engine. And in Qt 4.6 these have been further improved.
+engine. These changes were further improved in Qt 4.6.
 \tableofcontents
 …
 \endcode
 As demonstrated above, you need to Qt which drawing operations you want to
 warn/disable. Since there are varying implementations of DirectFB from
+As demonstrated above, you need to tell Qt which drawing operations you want
+to warn/disable. Since there are varying implementations of DirectFB from
 manufacturer to manufacture, different operations will be optimized. This
 require you to define the operations you want to warn about or disable.
 These are listed above in the DIRECTFB_DRAWINGOPERATIONS variable.
+You can also customize this with environment variables.
+E.g. If you want to disable fallbacks for drawPixmap and fillRect and also get
+a warning printed on stderr when a fallback would have happened.
+\code
+$ export QT_DIRECTFB_WARN_ON_RASTERFALLBACKS="FILL_RECT|DRAW_PIXMAP"
+$ export QT_DIRECTFB_DISABLE_RASTERFALLBACKS="FILL_RECT|DRAW_PIXMAP"
+$ ./app -qws -display directfb
+\endcode
 Following is a table showing which options you have.

trunk/doc/src/platforms/emb-displaymanagement.qdoc

-              r651
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** 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:LGPL$
+** $QT_BEGIN_LICENSE:FDL$
 ** Commercial Usage
 ** Licensees holding valid Qt Commercial licenses may use this file in
 ** accordance with the Qt Commercial License Agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and Nokia.
+** Software or, alternatively, in accordance with the terms contained in a
+** written agreement between you and Nokia.
 **
+** 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.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+** 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

trunk/doc/src/platforms/emb-envvars.qdoc

-              r651
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** 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:LGPL$
+** $QT_BEGIN_LICENSE:FDL$
 ** Commercial Usage
 ** Licensees holding valid Qt Commercial licenses may use this file in
 ** accordance with the Qt Commercial License Agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and Nokia.
+** Software or, alternatively, in accordance with the terms contained in a
+** written agreement between you and Nokia.
 **
+** 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.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+** 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
 …
     touch panels.
     Multiple keyboard drivers can be specified in one go:
+    Multiple mouse drivers can be specified in one go:
     \snippet doc/src/snippets/code/doc_src_emb-envvars.qdoc 3

trunk/doc/src/platforms/emb-features.qdoc

-              r769
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** 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:LGPL$
+** $QT_BEGIN_LICENSE:FDL$
 ** Commercial Usage
 ** Licensees holding valid Qt Commercial licenses may use this file in
 ** accordance with the Qt Commercial License Agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and Nokia.
+** Software or, alternatively, in accordance with the terms contained in a
+** written agreement between you and Nokia.
 **
+** 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.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+** 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

trunk/doc/src/platforms/emb-fonts.qdoc

-              r651
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** 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:LGPL$
+** $QT_BEGIN_LICENSE:FDL$
 ** Commercial Usage
 ** Licensees holding valid Qt Commercial licenses may use this file in
 ** accordance with the Qt Commercial License Agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and Nokia.
+** Software or, alternatively, in accordance with the terms contained in a
+** written agreement between you and Nokia.
 **
+** 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.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+** 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

trunk/doc/src/platforms/emb-framebuffer-howto.qdoc

-              r651
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** 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:LGPL$
+** $QT_BEGIN_LICENSE:FDL$
 ** Commercial Usage
 ** Licensees holding valid Qt Commercial licenses may use this file in
 ** accordance with the Qt Commercial License Agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and Nokia.
+** Software or, alternatively, in accordance with the terms contained in a
+** written agreement between you and Nokia.
 **
+** 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.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+** 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

trunk/doc/src/platforms/emb-hardwareacceleration.qdocinc

-              r561
+              r846
        \section1 Hardware Acceleration
         When designing applications for embedded devices there is often a
         compromise between graphics effects and performance. On most
         devices, you cannot have both simply because the hardware needed
         for such operations just is not there. With a growing number of
         devices that use hardware dedicated to graphics operations there is
         less need to compromise.
         In addition to enabling dynamic graphics effects, there are two
         other benefits to using graphics acceleration. One is that graphics
         acceleration hardware is more power efficient than using the CPU.
         The reason for this is that the CPU might require a clock speed
         that is up to 20 times higher than the GPU, achieving the same
         results. E.g. a typical hardware accelerated mobile graphics unit
         can rasterize one or two bilinear texture fetches in one cycle,
         while a software implementation takes easily more than 20 cycles.
         Typical \e {System-on-a-chip} (SoC) graphics hardware generally have
         a much lower clock speed and memory bandwidth, and different level
         of acceleration than desktop GPUs. One example is that many GPUs
         leave out transformation and lighting from the graphics pipeline
         and only implements rasterization.
         Another reason to use a GPU is to offload the main CPU, either for
         power saving or to perform other operations in parallel. Often
         drawing speed with a GPU is not that much faster than a CPU but
         the clear benefit of using the GPU is to free up the CPU to perform
         other tasks which can be used to create a more responsive use
         experience.
         The key to writing good applications for devices is therefore to
         limit the wow factor down to what the target hardware can handle,
         and to take advantage of any graphics dedicated hardware. Qt
         provides several ways to both render advanced effects on the screen
         and speed up your application using hardware accelerated graphics.
         \tableofcontents
         \section2 Qt for Embedded Graphics pipeline
         Qt uses QPainter for all graphics operations. By using the same API
         regardless of platform, the code can be reused on different devices.
         QPainter use different paint engines implemented in the QPaintEngine API to
         do the actual painting.
         The QPaintEngine API provides paint engines for each window system and
         painting framework supported by Qt. In regards to Qt for Embedded, this
         also includes implementations for OpenGL ES versions 1.1 and 2.0, as well
         as OpenVG and DirectFB(Embedded Linux only).
         By using one of these paint engines, you will be able to improve the
         graphics performance of your Qt application. However, if the graphics
         operations used are not supported, this might as well be a trap, slowing
         down your application significantly. This all depends on what kind of
         graphics operations that are supported by the target devices hardware
         configuration.
         \image platformHWAcc.png
         The paint engine will direct all graphics operations supported by the
         devices hardware to the GPU, and from there they are sent to the
         framebuffer. Unsupported graphics operations falls back to the
         QRasterPaintEngine and are handled by the CPU before sent to the
         framebuffer. In the end, the operating system sends the paint updates off
         to the screen/display. The fallback operation is quite expensive in regards
         to memory consumption, and should be avoided.
         \section2 Hardware configuration requirements
         Before implementing any application using hardware acceleration, it is wise
         to get an overview of what kind of hardware accelerated graphics operations
         that are available for the target device.
         \note On devices with no hardware acceleration, Qt will use
         QRasterPaintEngine, which handles the acceleration using software. On
         devices supporting OpenGL ES, OpenVG or DirectFB(not supported by Windows
         CE), Qt will use the
         respective paint engines to accelerate painting. However, hardware
         configurations that only support a limited set of hardware acceleration
         features, might slow the application graphics down rather than speeding it
         up when using unsupported operations that must fall back to the raster
         engine.
         \section3 Different architectures
         Based on the architecture used in a device we can make a recommendation on
         which hardware acceleration techniques to use. There are mainly two
         different architectures on embedded devices. These are devices with a
         Unified Memory Architecture (UMA), and devices with dedicated graphics
         memory. Generally, high-end devices will have dedicated graphics memory.
         Low-end devices will just use system memory, sometimes reserving a memory
         region and sometimes not.
         In addition to this, we can categorize the devices into five types based on
         the different graphics operations supported by their hardware.
         \list 1
                 \o No support for graphics acceleration.
                 \o Support for blitter and alpha blending.
                 \o Support for path based 2D vector graphics.
                 \o Support for fixed function 3D graphics.
                 \o Support for programmable 3D graphics.
         \endlist
         Based on these characteristics the table below recommends which paint
         engines to use with the different types of hardware configurations.
         \section3 Recommended use of hardware acceleration based on hardware
         \table
                 \header
                         \o Type
                         \o UMA
                         \o Non-UMA
                 \row
                         \o \bold {None}
                         \o Qt Raster Engine
                         \o Qt Raster Engine
                 \row
                         \o \bold {Blitter}
                         \o DirectFB
                         \o DirectFB
                 \row
                         \o \bold {2D Vector}
                         \o OpenVG
                         \o OpenVG
                 \row
                         \o \bold {Fixed 3D}
                         \o OpenGL (ES) 1.x
                         \o OpenGL (ES) 1.x
                 \row
                         \o \bold {Programmable 3D}
                         \o OpenGL (ES) 2.x
                         \o OpenGL (ES) 2.x
         \endtable
         \note Since the DirectFB API is quite primitive, the raster paint engine
         handles most of the operations.
         \note Blitter and Alpha blending is currently not supported on Windows CE.
+\section1 Hardware Acceleration
+When designing applications for embedded devices there is often a
+compromise between graphics effects and performance. On most
+devices, you cannot have both simply because the hardware needed
+for such operations just is not there. With a growing number of
+devices that use hardware dedicated to graphics operations there is
+less need to compromise.
+In addition to enabling dynamic graphics effects, there are two
+other benefits to using graphics acceleration. One is that graphics
+acceleration hardware is more power efficient than using the CPU.
+The reason for this is that the CPU might require a clock speed
+that is up to 20 times higher than the GPU, achieving the same
+results. E.g. a typical hardware accelerated mobile graphics unit
+can rasterize one or two bilinear texture fetches in one cycle,
+while a software implementation takes easily more than 20 cycles.
+Typical \e {System-on-a-chip} (SoC) graphics hardware generally have
+a much lower clock speed and memory bandwidth, and different level
+of acceleration than desktop GPUs. One example is that many GPUs
+leave out transformation and lighting from the graphics pipeline
+and only implements rasterization.
+Another reason to use a GPU is to offload the main CPU, either for
+power saving or to perform other operations in parallel. Often
+drawing speed with a GPU is not that much faster than a CPU but
+the clear benefit of using the GPU is to free up the CPU to perform
+other tasks which can be used to create a more responsive use
+experience.
+The key to writing good applications for devices is therefore to
+limit the wow factor down to what the target hardware can handle,
+and to take advantage of any graphics dedicated hardware. Qt
+provides several ways to both render advanced effects on the screen
+and speed up your application using hardware accelerated graphics.
+\tableofcontents
+\section2 Qt for Embedded Graphics pipeline
+Qt uses QPainter for all graphics operations. By using the same API
+regardless of platform, the code can be reused on different devices.
+QPainter use different paint engines implemented in the QPaintEngine API to
+do the actual painting.
+The QPaintEngine API provides paint engines for each window system and
+painting framework supported by Qt. In regards to Qt for Embedded, this
+also includes implementations for OpenGL ES versions 1.1 and 2.0, as well
+as OpenVG and DirectFB(Embedded Linux only).
+By using one of these paint engines, you will be able to improve the
+graphics performance of your Qt application. However, if the graphics
+operations used are not supported, this might as well be a trap, slowing
+down your application significantly. This all depends on what kind of
+graphics operations that are supported by the target devices hardware
+configuration.
+\image platformHWAcc.png
+The paint engine will direct all graphics operations supported by the
+devices hardware to the GPU, and from there they are sent to the
+framebuffer. Unsupported graphics operations falls back to the
+QRasterPaintEngine and are handled by the CPU before sent to the
+framebuffer. In the end, the operating system sends the paint updates off
+to the screen/display. The fallback operation is quite expensive in regards
+to memory consumption, and should be avoided.
+\section2 Hardware configuration requirements
+Before implementing any application using hardware acceleration, it is wise
+to get an overview of what kind of hardware accelerated graphics operations
+that are available for the target device.
+\note On devices with no hardware acceleration, Qt will use
+QRasterPaintEngine, which handles the acceleration using software. On
+devices supporting OpenGL ES, OpenVG or DirectFB(not supported by Windows
+CE), Qt will use the
+respective paint engines to accelerate painting. However, hardware
+configurations that only support a limited set of hardware acceleration
+features, might slow the application graphics down rather than speeding it
+up when using unsupported operations that must fall back to the raster
+engine.
+\section3 Different architectures
+Based on the architecture used in a device we can make a recommendation on
+which hardware acceleration techniques to use. There are mainly two
+different architectures on embedded devices. These are devices with a
+Unified Memory Architecture (UMA), and devices with dedicated graphics
+memory. Generally, high-end devices will have dedicated graphics memory.
+Low-end devices will just use system memory, sometimes reserving a memory
+region and sometimes not.
+In addition to this, we can categorize the devices into five types based on
+the different graphics operations supported by their hardware.
+\list 1
+    \o No support for graphics acceleration.
+    \o Support for blitter and alpha blending.
+    \o Support for path based 2D vector graphics.
+    \o Support for fixed function 3D graphics.
+    \o Support for programmable 3D graphics.
+\endlist
+Based on these characteristics the table below recommends which paint
+engines to use with the different types of hardware configurations.
+\section3 Recommended use of hardware acceleration based on hardware
+\table
+    \header
+        \o Type
+        \o UMA
+        \o Non-UMA
+    \row
+        \o \bold {None}
+        \o Qt Raster Engine
+        \o Qt Raster Engine
+    \row
+        \o \bold {Blitter}
+        \o DirectFB
+        \o DirectFB
+    \row
+        \o \bold {2D Vector}
+        \o OpenVG
+        \o OpenVG
+    \row
+        \o \bold {Fixed 3D}
+        \o OpenGL (ES) 1.x
+        \o OpenGL (ES) 1.x
+    \row
+        \o \bold {Programmable 3D}
+        \o OpenGL (ES) 2.x
+        \o OpenGL (ES) 2.x
+\endtable
+\note Since the DirectFB API is quite primitive, the raster paint engine
+handles most of the operations.
+\note Blitter and Alpha blending is currently not supported on Windows CE.

trunk/doc/src/platforms/emb-install.qdoc

-              r769
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** 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:LGPL$
+** $QT_BEGIN_LICENSE:FDL$
 ** Commercial Usage
 ** Licensees holding valid Qt Commercial licenses may use this file in
 ** accordance with the Qt Commercial License Agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and Nokia.
+** Software or, alternatively, in accordance with the terms contained in a
+** written agreement between you and Nokia.
 **
+** 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.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+** 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
 …
     \page qt-embedded-install.html
     \title Installing Qt on Embedded Linux
+    \title Installing Qt for Embedded Linux
     \ingroup qt-embedded-linux
     \ingroup installation
     \brief How to install Qt on Embedded Linux.
+    \brief How to install Qt for Embedded Linux.
     This document describes how to install \l{Qt for Embedded Linux} in your
 …
     Note that by default, \l{Qt for Embedded Linux} is configured for
     installation in the \c{/usr/local/Trolltech/QtEmbedded-4.6.3}
+    installation in the \c{/usr/local/Trolltech/QtEmbedded-4.7.2}
     directory, but this can be changed by using the \c{-prefix}
     option. Alternatively, the \c{-prefix-install} option can be used
 …
     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.3/lib. Note that on Linux
+    \c /usr/local/Trolltech/QtEmbedded-4.7.2/lib. Note that on Linux
     with GCC, this step is not needed.
 …
     Note that the virtual framebuffer requires a Qt for X11
     installation. See \l {Installing Qt on X11 Platforms} for details.
+    installation. See \l {Installing Qt for X11 Platforms} for details.
     The Linux framebuffer, on the other hand, is enabled by default on

trunk/doc/src/platforms/emb-kmap2qmap.qdoc

-              r651
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** 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:LGPL$
+** $QT_BEGIN_LICENSE:FDL$
 ** Commercial Usage
 ** Licensees holding valid Qt Commercial licenses may use this file in
 ** accordance with the Qt Commercial License Agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and Nokia.
+** Software or, alternatively, in accordance with the terms contained in a
+** written agreement between you and Nokia.
 **
+** 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.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+** 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

trunk/doc/src/platforms/emb-makeqpf.qdoc

-              r651
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** 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:LGPL$
+** $QT_BEGIN_LICENSE:FDL$
 ** Commercial Usage
 ** Licensees holding valid Qt Commercial licenses may use this file in
 ** accordance with the Qt Commercial License Agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and Nokia.
+** Software or, alternatively, in accordance with the terms contained in a
+** written agreement between you and Nokia.
 **
+** 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.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+** 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

trunk/doc/src/platforms/emb-opengl-EmbLinux.qdoc

-              r651
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** 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:LGPL$
+** $QT_BEGIN_LICENSE:FDL$
 ** Commercial Usage
 ** Licensees holding valid Qt Commercial licenses may use this file in
 ** accordance with the Qt Commercial License Agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and Nokia.
+** Software or, alternatively, in accordance with the terms contained in a
+** written agreement between you and Nokia.
 **
+** 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.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+** 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

trunk/doc/src/platforms/emb-openvg-EmbLinux.qdoc

-              r651
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** 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:LGPL$
+** $QT_BEGIN_LICENSE:FDL$
 ** Commercial Usage
 ** Licensees holding valid Qt Commercial licenses may use this file in
 ** accordance with the Qt Commercial License Agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and Nokia.
+** Software or, alternatively, in accordance with the terms contained in a
+** written agreement between you and Nokia.
 **
+** 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.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+** 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

trunk/doc/src/platforms/emb-openvg.qdocinc

-              r769
+              r846
 The QVG_SCISSOR_CLIP define will disable clipping with vgMask() or
 vgRenderToMask() and instead use the scissor rectangle list to perform
+clipping.  Clipping with an arbitrary QPainterPath will not be supported.
+clipping.  Clipping with an arbitrary QPainterPath will need to convert
+the path into a series of rectangles.  If the number of rectangles
+exceeds VG_MAX_SCISSOR_RECTS, then the results will not be exact.
 The QVG_SCISSOR_CLIP define should only be used if the OpenVG engine does

trunk/doc/src/platforms/emb-performance.qdoc

-              r651
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** 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:LGPL$
+** $QT_BEGIN_LICENSE:FDL$
 ** Commercial Usage
 ** Licensees holding valid Qt Commercial licenses may use this file in
 ** accordance with the Qt Commercial License Agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and Nokia.
+** Software or, alternatively, in accordance with the terms contained in a
+** written agreement between you and Nokia.
 **
+** 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.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+** 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

trunk/doc/src/platforms/emb-pointer.qdoc

-              r651
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** 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:LGPL$
+** $QT_BEGIN_LICENSE:FDL$
 ** Commercial Usage
 ** Licensees holding valid Qt Commercial licenses may use this file in
 ** accordance with the Qt Commercial License Agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and Nokia.
+** Software or, alternatively, in accordance with the terms contained in a
+** written agreement between you and Nokia.
 **
+** 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.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+** 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
 …
     explicitly to determine which device to use.
     To manually specify which driver to use, set the QWS_MOUSE_PROTO
+    To manually specify which driver to use, set the \c QWS_MOUSE_PROTO
     environment variable. For example (if the current shell is bash,
     ksh, zsh or sh):
 …
     The tslib sources can be downloaded from \l
     http://tslib.berlios.de. Use the \c configure script's -L and
     -I options to explicitly specify the location of the library and
     its headers:
+    http://tslib.berlios.de. Specify the location of the library and
+    its headers using -L and -I options in the \c qmake.conf file in
+    your \c mkspec. Also it can be helpful to add a -rpath-link:
     \snippet doc/src/snippets/code/doc_src_emb-pointer.qdoc 7
 …
     To make \l{Qt for Embedded Linux} explicitly choose the tslib mouse
     handler, set the QWS_MOUSE_PROTO environment variable as explained
+    handler, set the \c QWS_MOUSE_PROTO environment variable as explained
     above.
 …
     For instance, if you have specified the mouse driver with
     \snippet doc/src/snippets/code/doc_src_emb-pointer.qdoc 11
+    then examine the permissions of the device file by entering the following
+    command in a console:
+    then examine the permissions of the device file by entering the
+    following command in a console:
+    \snippet doc/src/snippets/code/doc_src_emb-pointer.qdoc show permissions
+    Change the permissions of the device file, if necessary, in the following
+    way:
     \snippet doc/src/snippets/code/doc_src_emb-pointer.qdoc 12

trunk/doc/src/platforms/emb-porting.qdoc

-              r651
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** 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:LGPL$
+** $QT_BEGIN_LICENSE:FDL$
 ** Commercial Usage
 ** Licensees holding valid Qt Commercial licenses may use this file in
 ** accordance with the Qt Commercial License Agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and Nokia.
+** Software or, alternatively, in accordance with the terms contained in a
+** written agreement between you and Nokia.
 **
+** 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.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+** 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

trunk/doc/src/platforms/emb-qvfb.qdoc

-              r651
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** 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:LGPL$
+** $QT_BEGIN_LICENSE:FDL$
 ** Commercial Usage
 ** Licensees holding valid Qt Commercial licenses may use this file in
 ** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** 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.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+** Software or, alternatively, in accordance with the terms contained in a
+** written agreement between you and Nokia.
+**
+** 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
 …
     QVFb is an X11 application supplied with Qt for X11 that provides
     a virtual framebuffer for Qt for Embedded Linux to use. To use it,
     you need to \l{Installing Qt on X11 Platforms}{configure and
     install Qt on X11 platforms} appropriately. Further requirements
+    you need to \l{Installing Qt for X11 Platforms}{configure and
+    install Qt for X11 platforms} appropriately. Further requirements
     can be found in the \l{Qt for Embedded Linux Requirements}
     document.
 …
         \list
             \o ClamshellPhone
+            \o pda
+            \o PDAPhone
+            \o Qt ExtendedPDA
+            \o Qt ExtendedPhone-Advanced
+            \o Qt ExtendedPhone-Simple
+            \o PortableMedia
+            \o S60-nHD-Touchscreen
+            \o S60-QVGA-Candybar
             \o SmartPhone
             \o SmartPhone2
             \o SmartPhoneWithButtons
             \o TouchscreenPhone
-            \o Trolltech-Keypad
-            \o Trolltech-Touchscreen
         \endlist

trunk/doc/src/platforms/emb-running.qdoc

-              r651
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** 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:LGPL$
+** $QT_BEGIN_LICENSE:FDL$
 ** Commercial Usage
 ** Licensees holding valid Qt Commercial licenses may use this file in
 ** accordance with the Qt Commercial License Agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and Nokia.
+** Software or, alternatively, in accordance with the terms contained in a
+** written agreement between you and Nokia.
 **
+** 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.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+** 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
 …
     \o
     Provided that the environment variables are adjusted properly
     during the \l {Installing Qt on Embedded Linux}{installation process}, you
+    during the \l {Installing Qt for Embedded Linux}{installation process}, you
     should see the \l {Text Edit} demo appear.

trunk/doc/src/platforms/emb-vnc.qdoc

-              r651
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** 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:LGPL$
+** $QT_BEGIN_LICENSE:FDL$
 ** Commercial Usage
 ** Licensees holding valid Qt Commercial licenses may use this file in
 ** accordance with the Qt Commercial License Agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and Nokia.
+** Software or, alternatively, in accordance with the terms contained in a
+** written agreement between you and Nokia.
 **
+** 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.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+** 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

trunk/doc/src/platforms/mac-differences.qdoc

-              r651
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** 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:LGPL$
+** $QT_BEGIN_LICENSE:FDL$
 ** Commercial Usage
 ** Licensees holding valid Qt Commercial licenses may use this file in
 ** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** 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.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+** Software or, alternatively, in accordance with the terms contained in a
+** written agreement between you and Nokia.
+**
+** 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
 …
     This file outlines known issues and possible workarounds when
     using Qt on Mac OS X. Contact Qt's technical support team if you find
+    using Qt for Mac OS X. Contact Qt's technical support team if you find
     additional issues which are not covered here. (See also the
     document \l{qtmac-as-native.html} {Qt is Mac OS X Native}.)
 …
     \l{http://developer.apple.com/documentation/CoreFoundation/Reference/CFBundleRef/index.html}
     {Apple's Developer Website}.
+    Note: QCoreApplication::applicationDirPath() can be used to determine
+    the path of the binary within the bundle.
     \section2 Translating the Application Menu and Native Dialogs
 …
     \ingroup licensing
     \brief License information for contributions by Apple, Inc. to specific parts of the Qt/Mac Cocoa port.
+    \brief License information for contributions by Apple, Inc. to specific parts of the Qt for Mac OS X Cocoa port.
     \legalese

trunk/doc/src/platforms/platform-notes-rtos.qdoc

-              r651
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** 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:LGPL$
+** $QT_BEGIN_LICENSE:FDL$
 ** Commercial Usage
 ** Licensees holding valid Qt Commercial licenses may use this file in
 ** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** 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.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+** Software or, alternatively, in accordance with the terms contained in a
+** written agreement between you and Nokia.
+**
+** 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
 …
 /*!
     \page platform-notes-vxworks.html
     \title Platform Notes - VxWorks
     \contentspage Platform Notes
+    \title Platform and Compiler Notes - VxWorks
+    \contentspage Platform and Compiler Notes
     \target VxWorks
 …
 /*!
     \page platform-notes-qnx.html
     \title Platform Notes - QNX
     \contentspage Platform Notes
+    \title Platform and Compiler Notes - QNX
+    \contentspage Platform and Compiler Notes
     \target QNX

trunk/doc/src/platforms/platform-notes.qdoc

-              r769
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** 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:LGPL$
+** $QT_BEGIN_LICENSE:FDL$
 ** Commercial Usage
 ** Licensees holding valid Qt Commercial licenses may use this file in
 ** accordance with the Qt Commercial License Agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and Nokia.
+** Software or, alternatively, in accordance with the terms contained in a
+** written agreement between you and Nokia.
 **
+** 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.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+** 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
 …
     \page platform-notes.html
     \ingroup platform-specific
     \title Platform Notes
+    \title Platform and Compiler Notes
     \brief Information about the platforms on which Qt can be used.
 …
     or incompatibilities.
+    Information about the combinations of platforms and compilers
+    supported by Qt can be found on the \l{Supported Platforms} page.
     \list
     \o \l{Platform Notes - X11}
     \tableofcontents{1 Platform Notes - X11}
     \o \l{Platform Notes - Windows}
     \tableofcontents{1 Platform Notes - Windows}
     \o \l{Platform Notes - Mac OS X}
     \tableofcontents{1 Platform Notes - Mac OS X}
     \o \l{Platform Notes - Symbian}
     \tableofcontents{1 Platform Notes - Symbian}
     \o \l{Platform Notes - Embedded Linux}
     \tableofcontents{1 Platform Notes - Embedded Linux}
     \o \l{Platform Notes - Windows CE}
     \tableofcontents{1 Platform Notes - Windows CE}
     \o \l{Platform Notes - QNX}
     \tableofcontents{1 Platform Notes - QNX}
     \o \l{Platform Notes - VxWorks}
     \tableofcontents{1 Platform Notes - VxWorks}
+    \o \l{Platform and Compiler Notes - X11}
+    \tableofcontents{1 Platform and Compiler Notes - X11}
+    \o \l{Platform and Compiler Notes - Windows}
+    \tableofcontents{1 Platform and Compiler Notes - Windows}
+    \o \l{Platform and Compiler Notes - Mac OS X}
+    \tableofcontents{1 Platform and Compiler Notes - Mac OS X}
+    \o \l{Platform and Compiler Notes - Symbian}
+    \tableofcontents{1 Platform and Compiler Notes - Symbian}
+    \o \l{Platform and Compiler Notes - Embedded Linux}
+    \tableofcontents{1 Platform and Compiler Notes - Embedded Linux}
+    \o \l{Platform and Compiler Notes - Windows CE}
+    \tableofcontents{1 Platform and Compiler Notes - Windows CE}
+    \o \l{Platform and Compiler Notes - QNX}
+    \tableofcontents{1 Platform and Compiler Notes - QNX}
+    \o \l{Platform and Compiler Notes - VxWorks}
+    \tableofcontents{1 Platform and Compiler Notes - VxWorks}
     \endlist
+    See also the \l{Compiler Notes} for information about compiler-specific
+    build issues. Information about the combinations of platforms and compilers
+    supported by Qt can be found on the \l{Supported Platforms} page.
+    \section1 General Compiler Notes
+    \section2 Supported Features
+    Not all compilers used to build Qt are able to compile all modules. The following table
+    shows the compiler support for five modules that are not uniformly available for all
+    platforms and compilers.
+    \table
+    \header \o Compiler \o{5,1} Features
+    \header \o                  \o Concurrent \o XmlPatterns \o WebKit(*)   \o CLucene  \o Phonon
+    \row    \o g++ 3.3          \o            \o \bold{X}    \o          \o \bold{X} \o \bold{X}
+    \row    \o g++ 3.4 and up   \o \bold{X}   \o \bold{X}    \o \bold{X} \o \bold{X} \o \bold{X}
+    \row    \o SunCC 5.5        \o            \o             \o          \o \bold{X} \o \bold{X}
+    \row    \o aCC series 3     \o            \o             \o          \o \bold{X} \o \bold{X}
+    \row    \o aCC series 6     \o \bold{X}   \o \bold{X}    \o \bold{X} \o \bold{X} \o \bold{X}
+    \row    \o xlC 6            \o            \o             \o          \o \bold{X} \o \bold{X}
+    \row    \o Intel CC 10      \o \bold{X}   \o \bold{X}    \o \bold{X} \o \bold{X} \o \bold{X}
+    \row    \o MSVC 2003        \o \bold{X}   \o \bold{X}    \o          \o \bold{X} \o \bold{X}
+    \row    \o MSVC 2005 and up \o \bold{X}   \o \bold{X}    \o \bold{X} \o \bold{X} \o \bold{X}
+    \endtable
+    * WebKit is only supported as a dynamically built library. Static linkage is not supported.
+    \section2 GCC 3.4.6 (Debian 3.4.6-5) on AMD64 (x86_64)
+    This compiler is known to miscompile some parts of Qt when doing a
+    release build. There are several workarounds:
+    \list 1
+    \o Use a debug build instead.
+    \o For each miscompilation encountered, recompile the file, removing the \c{-O2} option.
+    \o Add \c{-fno-gcse} to the
+       \l{qmake Variable Reference#QMAKE_CXXFLAGS_RELEASE}{QMAKE_CXXFLAGS_RELEASE} qmake
+       variable.
+    \endlist
+    \section2 GCC 4.0.0
+    The released package of the compiler has some bugs that lead to
+    miscompilations.  We recommend using GCC 4.0.1 or later, or to use
+    a recent CVS snapshot of the GCC 4.0 branch. The version of GCC
+.0.0 that is shipped with Mac OS X 10.4 "Tiger" is known to work
+    with Qt for Mac OS X.
+    \section2 Intel C++ Compiler
+    Qt supports the Intel C++ compiler on both Windows and Linux.
+    However, there are a few issues on Linux; see
+    \l{Platform and Compiler Notes - X11#Intel C++ Compiler for Linux}{Intel C++ Compiler for Linux}
+    for details.
+    \section1 Feedback and Corrections
     If you have anything to add to this list or any of the platform or
 …
 /*!
     \page platform-notes-x11.html
     \title Platform Notes - X11
     \contentspage Platform Notes
+    \title Platform and Compiler Notes - X11
+    \contentspage Platform and Compiler Notes
     This page contains information about the X11 platforms Qt is currently
 …
     \section1 AIX - 5.2
+    Qt has been tested on AIX 5.2, using the
+    \l{Compiler Notes#IBM xlC (AIX)}{xlC} compiler.
+    Qt has been tested on AIX 5.2, using the xlC compiler.
     \table
 …
     \endtable
+    \section2 IBM xlC
+    The makeC++SharedLib utility must be in your PATH and be up to date to
+    build shared libraries. From IBM's
+    \l{http://www.redbooks.ibm.com/abstracts/sg245674.html}{C and C++ Application Development on AIX}
+    Redbook:
+    \list
+    \o "The second step is to use the makeC++SharedLib command to create the
+       shared object. The command has many optional arguments, but in its
+       simplest form, can be used as follows:"
+       \snippet doc/src/snippets/code/doc_src_compiler-notes.qdoc 1
+    \o "The full path name to the command is not required; however, to avoid
+       this, you will have to add the directory in which it is located to
+       your PATH environment variable. The command is located in the
+       /usr/vacpp/bin directory with the VisualAge C++ Professional for AIX,
+       Version 5 compiler."
+    \endlist
+    \section2 VisualAge C++ for AIX, Version 6.0
+    Make sure you have the
+    \l{http://www-1.ibm.com/support/search.wss?rs=32&amp;tc=SSEP5D&amp;dc=D400}{latest upgrades}
+    installed.
     \target FreeBSD
     \section1 FreeBSD - 6.0-RELEASE
 …
     \l{Supported Platforms} page for more information.
     The system compiler on FreeBSD 4.x is gcc 2.95.4, which is not
+    The system compiler on FreeBSD 4.x is GCC 2.95.4, which is not
     officially supported by Qt 4. We develop using and recommend
     ports/lang/gcc34. You will need to run configure with the
 …
     migrated to 6.x after the Qt 4 launch. FreeBSD-CURRENT is not supported.
-    \target HP-UX
     \section1 HP-UX
 …
     You can configure Qt for aCC in 32 and 64 bit mode (hpux-acc-64 or
     hpux-acc-32), or gcc in 32 bit mode (hpux-g++).  The default platform is
+    hpux-acc-32), or GCC in 32 bit mode (hpux-g++).  The default platform is
     hpux-acc-32. The minimum required version for aCC (HP ANSI C++) on PA-RISC
     is A.03.57. The supported gcc compiler is gcc 3.4.3.
+    is A.03.57. The supported GCC compiler is GCC 3.4.3.
     \section2 Itanium - B.11.23 or later
     You can configure Qt for aCC in 32 and 64 bit mode (hpuxi-acc-64 or
     hpuxi-acc-32). gcc is currently unsupported.  The default platform is
+    hpuxi-acc-32). GCC is currently unsupported.  The default platform is
     hpuxi-acc-64. The minimum required version for aCC (HP ANSI C++) on
     Itanium is A.06.12.
+    \section2 HP ANSI C++ (aCC)
+    The hpux-acc-32 and hpux-acc-64 platforms are tested with aCC A.03.57. The
+    hpuxi-acc-32 and hpuxi-acc-64 platforms are tested with aCC A.06.10.
+    \section2 GCC
+    The hpux-g++ platform is tested with GCC 3.4.4.
     \section2 OpenGL Support
 …
     \section1 IRIX - 6.5.x
     \bold{IRIX is an unsupported platform - please see Qt's online
     \l{Platform Support Policy} for details.}
+    \bold{IRIX is an unsupported platform. See the \l{Supported Platforms} page
+    and Qt's Software's online \l{Platform Support Policy} page for details.}
     Unpackaging and IRIX tar:
 …
     tar. Please use GNU tar to unpack Qt packages.
+    \section2 MIPSpro
+    Qt 4.4.x requires MIPSpro version 7.4.2m.
+    Note that MIPSpro version 7.4.4m is currently not supported, since it has
+    introduced a number of problems that have not yet been resolved.
+    We recommend using 7.4.2m for Qt development. However, please note the
+    unsupported status of this platform.
     \section1 Linux
 …
     Linux/x86, Linux/ppc, Linux/amd64 and Linux/ia64 (including Altix(R)).
     For the gcc/g++ compiler, please also see the relevant
     \l{Compiler Notes#GCC}{compiler page}.
+    For the GCC compiler, please also see the relevant
+    \l{Platform and Compiler Notes#General Compiler Notes}{General Compiler Notes}.
     \section2 Installation problems
 …
     this problem.
+    \section2 Intel C++ Compiler for Linux
+    Nokia currently tests the following compilers:
+    \list
+    \o Intel(R) C++ Compiler for applications running on IA-32,
+    Version 10.1 Build 20080602 Package ID: l_cc_p_10.1.017
+    \o Intel(R) C++ Compiler for applications running on Intel(R) 64,
+    Version 10.1 Build 20080602 Package ID: l_cc_p_10.1.017
+    \endlist
+    We do not currently test the IA-64 (Itanium) compiler.
+    \section2 Known Issues with Intel C++ Compiler for Linux
+    \list
+    \o Precompiled header support does not work in version 10.0.025
+       and older. For these compilers, you should configure Qt with
+       -no-pch. Precompiled header support works properly in version
+.0.026 and later.
+    \o Version 10.0.026 for Intel 64 is known to miscompile qmake when
+       building in release mode. For now, configure Qt with
+       -debug. Version 10.1.008 and later can compile qmake in release
+       mode.
+    \o Versions 10.1.008 to 10.1.015 for both IA-32 and Intel 64 are
+       known crash with "(0): internal error: 0_47021" when compiling
+       QtXmlPatterns, QtWebKit, and Designer in release mode. Version
+.1.017 compiles these modules correctly in release mode.
+    \endlist
     \target Solaris
     \section1 Solaris - 9 or later
 …
     (http://star.berlios.de).
+    \section2 CC on Solaris
+    Be sure to check our \l{Compiler Notes#Sun Studio}{Forte Developer / Sun Studio}
+    notes.
+    \section2 GCC on Solaris
+    Be sure to check the installation notes for \l{GCC on Solaris}.
+    Please note that WebKit is not supported for Solaris, regardless of
+    which compiler is used.
+    \section2 CC
+    See the notes for \l{Forte Developer / Sun Studio}.
+    \section2 GCC
+    Please use GCC 3.4.2 or later.
     Do not use GCC with Sun's assembler/linker, this will result in link-time
     errors in shared libraries. Use GNU binutils instead.
     GCC 3.2.* is known to miscompile Qt due to an optimizer bug that will
+    cause the resulting binaries to hang. Please use GCC 3.4.2 or later.
+    cause the resulting binaries to hang.
+    \section2 Forte Developer / Sun Studio
+    Qt is tested using Sun Studio 12 (Sun CC 5.9). Go to
+    \l{Sun Studio Patches} page on Sun's Web site to download
+    the latest patches for your Sun compiler.
+    Please note that Qt 4.6 is stricter in its STL requirements and
+    that the default STL implementation used by Sun CC does not pass
+    those requirements. This does not affect binary compatibility and
+    you can continue to use STL in your own code, but Qt's
+    STL-compatibility functions will be disabled.
+    Sun CC ships with a secondary STL implementation (called stlport4)
+    which is standards-compliant and can be used by Qt. You can enable
+    it by passing the -library=stlport4 option to the compiler. Note
+    that this does not affect Qt's binary compatibility, but it may
+    affect that of other libraries and programs that use STL.
+    \section2 Sun WorkShop 5.0
+    Sun WorkShop 5.0 is not supported with Qt 4.
 */
 /*!
     \page platform-notes-windows.html
     \title Platform Notes - Windows
     \contentspage Platform Notes
+    \title Platform and Compiler Notes - Windows
+    \contentspage Platform and Compiler Notes
     This page contains information about the Windows platforms Qt is currently
 …
     \section1 Windows Vista
     At the time Qt 4.6.3 was released, there were no known Vista-specific issues.
+    At the time Qt 4.7.2 was released, there were no known Vista-specific issues.
     \target Windows NT
 …
     Install Qt into a subdirectory without spaces to avoid this problem.
-    \section2 AccelGALAXY graphic card
-    When you use a NT 4.0 machine with the driver number
-,00,1381,1000,021,4.0.0 there is a problem with drag an drop and icons.
-    The computer freezes, and you have to reset. The problem disappears with
-    the newest version of the driver, available at
-    \l{http://www.es.com/}{www.es.com}.
     \section2 Possible GL conflict
 …
     rendering is enabled. Other GL-applications may not work as expected,
     unless direct rendering is disabled.
+    \section2 GCC (MinGW)
+    We have tested Qt with this compiler on Windows XP.
+    The minimal version of MinGW supported is GCC 4.4.
+    \note For users of the MinGW binary package: This package is now
+    based on MinGW 4.4. The installer no longer offers to download
+    MinGW for you, but rather offers to use a version of MinGW that
+    you already have installed on your machine. You just tell the
+    installer which directory MinGW is installed in. If you don't
+    already have MinGW 4.4 installed, you can download a .zip archive
+    from our \l{ftp://ftp.trolltech.com/misc/MinGW-gcc440_1.zip}{FTP
+    site}. This archive provides fixes to MinGW and support for
+    missing API, See the _patches directory in the archive for
+    details.
+    \note A MinGW installation is only needed to build against the
+    binary pacakge, not to run the pre-compiled binaries that are in
+    the package.
+    \section2 Intel C++ Compiler (Windows, Altix)
+    Qt 4 has been tested successfully with:
+    \list
+    \o Windows - Intel(R) C++ Compiler for 32-bit applications,
+       Version 9.1.040.
+    \o Altix - Intel(R) C++ Itanium(R) Compiler for Itanium(R)-based
+       applications Version 8.1 Build 20050406 Package ID: l_cc_pc_8.1.030
+    \endlist
+    We currently only test the Intel compiler on 32-bit Windows versions.
+    \section2 Visual Studio (Windows)
+    We do most of our Windows development on Windows XP, using Microsoft
+    Visual Studio .NET 2005 and Visual Studio 2008 (both the 32- and 64-bit
+    versions).
+    Qt works with the Standard Edition, the Professional Edition and Team
+    System Edition of Visual Studio 2005.
+    In order to use Qt with the Visual Studio 2005/2008 Express Edition you need
+    to download and install the platform SDK. Due to limitations in the
+    Express Edition it is not possible for us to install the Qt Visual
+    Studio Integration. You will need to use our command line tools to
+    build Qt applications with this edition.
+    The Visual C++ Linker doesn't understand filenames with spaces (as in
+    \c{C:\Program files\Qt\}) so you will have to move it to another place,
+    or explicitly set the path yourself; for example:
+    \snippet doc/src/snippets/code/doc_src_compiler-notes.qdoc 0
+    If you are experiencing strange problems with using special flags that
+    modify the alignment of structure and union members (such as \c{/Zp2})
+    then you will need to recompile Qt with the flags set for the
+    application as well.
+    If you're using Visual Studio .NET (2002) Standard Edition, you should be
+    using the Qt binary package provided, and not the source package.
+    As the Standard Edition does not optimize compiled code, your compiled
+    version of Qt would perform suboptimally with respect to speed.
+    With Visual Studio 2005 Service Pack 1 a bug was introduced which
+    causes Qt not to compile, this has been fixed with a hotfix available
+    from Microsoft. See this
+    \l{http://qt.nokia.com/developer/faqs/faq.2006-12-18.3281869860}{Knowledge Base entry}
+    for more information.
+    There currently is a problem when compiling Qt with Visual Studio 2010 for 64-bit.
+    Its optimizer causes trouble and generates code that crashes for the release builds.
+    To avoid the crashes, You need to apply the hotfix in the following article
+    http://support.microsoft.com/kb/2280741.
 */
 /*!
     \page platform-notes-mac.html
     \title Platform Notes - Mac OS X
     \contentspage Platform Notes
+    \title Platform and Compiler Notes - Mac OS X
+    \contentspage Platform and Compiler Notes
     This page contains information about the Mac OS X versions Qt is currently
 …
     \section2 Required GCC version
     Apple's gcc 4 that is shipped with the Xcode Tools for both Mac OS X 10.4
     and 10.5 will compile Qt. There is preliminary support for gcc 4.2 which
+    Apple's GCC 4 that is shipped with the Xcode Tools for both Mac OS X 10.4
+    and 10.5 will compile Qt. There is preliminary support for GCC 4.2 which
     is included with Xcode Tools 3.1+ (configurable with
     \c{-platform macx-g++42}).
+    Please use the latest GCC 3.3 from Apple or a later version of GCC 3.
+    The GCC 3.3 that is provided with Xcode 1.5 is known to generate bad code.
+    Use the November 2004 GCC 3.3 updater \l{http://connect.apple.com}{available from Apple}.
     \section2 Binary Package
 …
     The binary package was built on Mac OS X 10.4 with Xcode Tools 2.1
     (gcc 4.0.0) for Qt 4.1.0, Xcode Tools 2.2 (gcc 4.0.1) for Qt 4.1.1-4.1.4
+    (GCC 4.0.0) for Qt 4.1.0, Xcode Tools 2.2 (GCC 4.0.1) for Qt 4.1.1-4.1.4
     and Xcode Tools 2.3 for 4.2.0. It will only link executables built
     against 10.4 (or a 10.4 SDK). You should be able to run applications
 …
 /*!
     \page platform-notes-windows-ce.html
     \title Platform Notes - Windows CE
     \contentspage Platform Notes
+    \title Platform and Compiler Notes - Windows CE
+    \contentspage Platform and Compiler Notes
     This page contains information about the Windows CE and Windows Mobile
 …
 /*!
     \page platform-notes-symbian.html
     \title Platform Notes - Symbian
     \contentspage Platform Notes
+    \title Platform and Compiler Notes - Symbian
+    \contentspage Platform and Compiler Notes
     \ingroup platform-specific
     \brief Information about the state of support for the Symbian platform.
 …
     \endtable
+    \section1 Compiler Notes
+    \section2 GCCE (Symbian)
+    GCCE cannot be used to compile Qt libaries for the Symbian platform, but GCCE is supported
+    when compiling Qt applications for the Symbian platform.
     \section1 Known Issues
 …
     \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 QtDeclarative
+            \o \c NetworkServices is automatically added for this module.
     \row    \o QtNetwork
+            \o \c NetworkServices is basically always required for this module.
+            \o \c NetworkServices is automatically added for this module.
+    \row    \o QtNetwork
+            \o \c ReadUserData is required to include all the phone's SSL certificates in the system's default CA certificate list
+                  (for example those added by the user or stored in the SIM card),
+                  without this capability only the CA certs built into the phone are used.
     \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.
+    \row    \o QtWebkit
+            \o \c NetworkServices is automatically added for this module.
+    \endtable
+    \note Some modules rely on other modules. E.g. QtWebkit and QtDeclarative
+    depend on QtNetwork and therefore any application that
+    depends on these modules is also likely to need \c NetworkServices capability.
     For more information see the documentation of the individual Qt classes. If
 …
     plugin. If the Helix plugin fails to load, the MMF plugin, if present on
     the device, will be loaded instead.
+    \section1 UI Performance in devices prior to Symbian^3
+    Qt uses the QPainter class to perform low-level painting on widgets and
+    other paint devices. QPainter provides functions to draw complex shapes,
+    aligned text and pixmaps. It can also do vector path clipping, coordinate
+    transformations and Porter-Duff composition. If the underlying graphics
+    architecture does not support all of these operations then Qt uses the
+    raster graphics system for rendering.
+    Most of the Symbian devices prior to Symbian^3 use a non-ScreenPlay
+    graphics architecture which does not have native support for all functions
+    provided by QPainter. In non-ScreenPlay devices Qt uses the raster
+    graphics system by default which has a performance penalty when compared
+    to native Symbian rendering.
+    In order to be able to perform all functions provided by QPainter, the
+    raster graphics system needs to have pixel level framebuffer access. To
+    make this possible in non-ScreenPlay devices Qt has to create an
+    additional offscreen buffer that is the target for all Qt rendering
+    operations. Qt renders the widget tree to the offscreen buffer and the
+    offscreen buffer is blitted to the framebuffer via Symbian Window Server.
+    The following table shows the rendering stacks of native Symbian and Qt in
+    non-ScreenPlay devices.
+    \table
+    \header \o Symbian
+            \o Qt
+    \row    \o \image symbian-rendering-stack-non-screenplay.png
+            \o \image symbian-qt-rendering-stack-non-screenplay.png
+    \endtable
+    The following diagrams show a simplified sequence of drawing a pixmap in
+    a non-ScreenPlay device.
+    \table
+    \header \o Symbian
+    \row    \o \image symbian-draw-pixmap-sequence.png
+    \endtable
+    \table
+    \header \o Qt
+    \row    \o \image symbian-qt-draw-pixmap-sequence.png
+    \endtable
+    When compared to a native Symbian application, Qt does an additional blit
+    to the offscreen buffer before drawing to the framebuffer. That is the
+    performance penalty which needs to be paid to get all functionality
+    provided by QPainter in non-ScreenPlay architecture.
 */
 /*!
     \page platform-notes-embedded-linux.html
     \title Platform Notes - Embedded Linux
     \contentspage Platform Notes
+    \title Platform and Compiler Notes - Embedded Linux
+    \contentspage Platform and Compiler Notes
     This page contains information about the Embedded Linux platforms Qt is

trunk/doc/src/platforms/qt-embedded-linux.qdoc

-              r651
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** 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:LGPL$
+** $QT_BEGIN_LICENSE:FDL$
 ** Commercial Usage
 ** Licensees holding valid Qt Commercial licenses may use this file in
 ** accordance with the Qt Commercial License Agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and Nokia.
+** Software or, alternatively, in accordance with the terms contained in a
+** written agreement between you and Nokia.
 **
+** 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.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+** 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
 …
      \list
         \o \l {Qt for Embedded Linux Architecture}{Architecture Overview}
         \o \l {Installing Qt on Embedded Linux}{Installation}
+        \o \l {Installing Qt for Embedded Linux}{Installation}
         \o \l {Running Qt for Embedded Linux Applications}{Running Applications}
         \o \l {Qt for Embedded Linux Examples}{Examples}

trunk/doc/src/platforms/qt-embedded.qdoc

-              r651
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** 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:LGPL$
+** $QT_BEGIN_LICENSE:FDL$
 ** Commercial Usage
 ** Licensees holding valid Qt Commercial licenses may use this file in
 ** accordance with the Qt Commercial License Agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and Nokia.
+** Software or, alternatively, in accordance with the terms contained in a
+** written agreement between you and Nokia.
 **
+** 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.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+** 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

trunk/doc/src/platforms/qtmac-as-native.qdoc

-              r651
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** 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:LGPL$
+** $QT_BEGIN_LICENSE:FDL$
 ** Commercial Usage
 ** Licensees holding valid Qt Commercial licenses may use this file in
 ** accordance with the Qt Commercial License Agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and Nokia.
+** Software or, alternatively, in accordance with the terms contained in a
+** written agreement between you and Nokia.
 **
+** 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.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+** 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

trunk/doc/src/platforms/supported-platforms.qdoc

-              r769
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** 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:LGPL$
+** $QT_BEGIN_LICENSE:FDL$
 ** Commercial Usage
 ** Licensees holding valid Qt Commercial licenses may use this file in
 ** accordance with the Qt Commercial License Agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and Nokia.
+** Software or, alternatively, in accordance with the terms contained in a
+** written agreement between you and Nokia.
 **
+** 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.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+** 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
 …
     \tableofcontents
+    Information about the specific platforms Qt runs on can be found on the
+    \l{Platform Notes} page. Information about the compilers used on each platform
+    can be found on the \l{Compiler Notes} page.
+    Information about the specific platforms Qt runs on, and the compilers used
+    on each platform, can be found on the \l{Platform and Compiler Notes} page.
     \section1 Tier 1 Platforms
 …
                                      \o gcc 4.2
     \row    \o Microsoft Windows XP
                                      \o gcc 4.4 (MinGW) (32-bit), MSVC 2003, 2005 (32 and 64-bit)
+                                     \o gcc 4.4 (MinGW) (32-bit), MSVC 2005 (32 and 64-bit)
     \row    \o Microsoft Windows Vista
                                      \o MSVC 2005, 2008
     \row    \o Microsoft Windows Vista 64bit
                                      \o MSVC 2008
+    \row    \o Apple Mac OS X 10.5 "Leopard" x86_64 (Carbon, Cocoa 32 and 64bit)
+    \row    \o Microsoft Windows 7
+                                     \o MSVC 2008
+    \row    \o Apple Mac OS X 10.6 "Snow Leopard"
+                                     \o As provided by Apple
+    \row    \o Apple Mac OS X 10.5 "Leopard" x86_64 (Cocoa 32 and 64bit)
                                      \o As provided by Apple
     \row    \o Embedded Linux QWS (ARM)
 …
     \row    \o Windows CE 5.0 (ARMv4i, x86, MIPS)
                                      \o MSVC 2005 WinCE 5.0 Standard (x86, pocket, smart, mipsii)
     \row    \o Symbian (Symbian/S60 3.1, 3.2 and 5.0)
+    \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
 …
     \section1 Tier 2 Platforms
+    Tier 2 platforms are subjected to our unit test suite and other internal testing
+    tools prior to release of new product versions.  Qt users should note, however,
+    that errors may be present in released product versions for Tier 2 platforms and,
+    subject to resource availability, known errors in Tier 2 platforms may or may not
+    be corrected prior to new version releases.
+    Tier 2 platforms are subject to ad hoc and internal testing. However, Qt users
+        should note that errors may be present in released product versions for Tier 2
+        platforms and, subject to resource availability, known errors in Tier 2 platforms
+        may or may not be corrected prior to new version releases.
     \table
     \header \o Platform
                                      \o Compilers
-    \row    \o Windows XP, Vista
-                                     \o gcc 3.4.2 (MinGW)
     \row    \o Windows 7
                                      \o MSVC 2008
     \row    \o Apple Mac OS X 10.6 "Snow Leopard"
+                                     \o MSVC 2010
+    \row    \o Apple Mac OS X 10.4 "Tiger" (Carbon)
                                      \o As provided by Apple
     \row    \o Apple Mac OS X 10.4 "Tiger"
+    \row    \o Apple Mac OS X 10.5 "Leopard" (Carbon)
                                      \o As provided by Apple
-    \row    \o HPUXi 11.11
-                                     \o aCC 3.57, gcc 3.4
     \row    \o HPUXi 11.23
                                      \o aCC 6.10
     \row    \o Solaris 10 (UltraSparc, x86)
+    \row    \o Solaris 10 UltraSparc
                                      \o Sun Studio 12
     \row    \o AIX 6
 …
     \row    \o Embedded Linux X11 (ARM)
                                      \o gcc (\l{http://www.scratchbox.org/}{Scratchbox)}
+    \row    \o Windows CE 6.0 (ARMv4i, x86, MIPS)
+                                     \o MSVC 2008 WinCE 6.0 Professional
+    \row    \o Windows CE 5.0 (ARMv4i, x86, MIPS)
+                                     \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
+        \note The PPC architecture on Mac has been downgraded from tier 1 to tier 2 for 4.7.
     \section1 Tier 3 Platforms (Not supported by Nokia)
 …
     non-infringement with regard to the Licensed Software.
     \section1 Planned Changes for Qt 4.7
+    \section1 Planned Changes for Qt 4.8
     The following changes to the list of supported platforms are at time of publishing
     planned for Qt 4.7:
+    planned for Qt 4.8:
     \list
+    \o Upgrade Windows 7 to Tier 1
+    \o Upgrade Mac OS X 10.6 to Tier 1
+    \o Add support for Visual Studio 2010 (Tier 2)
+    \o Move support for Carbon implementation of Qt on Mac OS X from Tier 1 to Tier 2
+    \o Drop support for MinGW 3.4
+    \o Drop support for Visual Studio 2003
+    \o Drop support for HP-UX on PA-RISC
+    \o Drop support for Windows Mobile 5
+    \o Drop support for OpenGL ES Common Lite 1.0
+    \o Plans not yet released
     \endlist
 */

trunk/doc/src/platforms/symbian-exceptionsafety.qdoc

-              r651
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** 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:LGPL$
+** $QT_BEGIN_LICENSE:FDL$
 ** Commercial Usage
 ** Licensees holding valid Qt Commercial licenses may use this file in
 ** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** 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.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+** Software or, alternatively, in accordance with the terms contained in a
+** written agreement between you and Nokia.
+**
+** 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

trunk/doc/src/platforms/symbian-introduction.qdoc

-              r769
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** 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:LGPL$
+** $QT_BEGIN_LICENSE:FDL$
 ** Commercial Usage
 ** Licensees holding valid Qt Commercial licenses may use this file in
 ** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** 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.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+** Software or, alternatively, in accordance with the terms contained in a
+** written agreement between you and Nokia.
+**
+** 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
 …
     \title Qt for the Symbian platform
     \ingroup qt-embedded
     \brief Documents related to Qt on the Symbian platform
+    \brief Documents related to Qt for the Symbian platform
     Qt for Symbian is a C++ framework for GUI and application development
 …
      \list
         \o \l {Qt for the Symbian platform Requirements}
         \o \l {Installing Qt on the Symbian platform from a Binary Package}
         \o \l {Installing Qt on the Symbian platform}
+        \o \l {Installing Qt for the Symbian platform from a Binary Package}
+        \o \l {Installing Qt for the Symbian platform}
         \o \l {The Symbian platform - Introduction to Qt}{Introduction to using Qt}
     \endlist
 …
     \list
         \o \l {Exception Safety with Symbian}
         \o \l {Platform Notes - Symbian} {Qt for the Symbian platform - state of support}
+        \o \l {Platform and Compiler Notes - Symbian} {Qt for the Symbian platform - state of support}
         \o \l {qmake Platform Notes#Symbian platform} {Qt for Symbian extensions for qmake}
+        \o \l {Symbian Platform Security Requirements} {Symbian Platform Security Requirements}
     \endlist
     \o
 …
 /*!
+    \page symbian-platform-security-requirements.html
+    \title Symbian Platform Security Requirements
+    \ingroup qtsymbian
+    On Symbian, processes that access media via the network must
+    have the \c NetworkServices platform security capability. If the client
+    process lacks this capability, operations will result in errors.
+    This failure is indicated by a state() of Phonon::ErrorState.
+    Platform security capabilities are added via the
+    \l{qmake-variable-reference.html#target-capability}{TARGET.CAPABILITY}
+    qmake variable.
+*/
+/*!
     \page symbian-with-qt-introduction.html
 …
     \tableofcontents
     \section1 Required tools
+    \section1 Required Tools
     See \l{Qt for the Symbian platform Requirements} to see what tools are
     required to use Qt for the Symbian platform.
     \section1 Installing Qt and running demos
     Follow the instructions found in \l{Installing Qt on the Symbian platform from a Binary Package}
+    \section1 Installing Qt and Running Demos
+    Follow the instructions found in \l{Installing Qt for the Symbian platform from a Binary Package}
     to learn how to install Qt using a binary package and how to build and run Qt demos.
     Follow the instructions found in \l{Installing Qt on the Symbian platform} to learn how to install Qt using
+    Follow the instructions found in \l{Installing Qt for the Symbian platform} to learn how to install Qt using
     using source package and how to build and run the Qt demos.
     \section1 Building your own applications
+    \section1 Building Your Own Applications
     If you are new to Qt development, have a look at \l{How to Learn Qt}.
 …
     For more information on how to use qmake have a look at the \l
+    {qmake Tutorial}.
+    {qmake Tutorial}. In particular, see the
+    \l{qmake Platform Notes#Symbian platform}{qmake Platform Notes} for
+    details of Symbian-specific build settings.
     Now you can build the Qt for the Symbian platform application with
+    standard build tools. By default, running \c make will produce binaries for
+    the emulator. However, the Symbian platform comes with several alternative
+    build targets, as shown in the table below:
+    standard build tools.
+    \section2 Alternative Build Targets
+    By default, running \c make will produce binaries for the emulator.
+    However, the Symbian platform comes with several alternative
+    build targets that can be used to create binaries for target hardware
+    and deploy them on devices, as shown in the table below:
     \table
 …
     \row \o \c run           \o Run the application on the emulator.
     \row \o \c runonphone    \o Run the application on a device.
+    \row \o \c deploy        \o Deploys the project into a device.
     \row \o \c sis           \o Create signed \c .sis file for project.
+    \row \o \c unsigned_sis  \o Create unsigned \c .sis file for project.
     \row \o \c installer_sis \o Create signed \l{Smart Installer}{smart installer}
                                 \c .sis file for project.
 …
                                 missing dependencies in addition to
                                 just installing the application.
+                                Note: The application \c .sis contained in smart installer \c .sis
+                                will be recreated and signed with same certificates as
+                                smart installer \c .sis.
+    \row \o \c ok_installer_sis \o Otherwise similar to \c installer_sis target, except
+                                the application sis will not be recreated. This is useful
+                                when application \c .sis needs to be separately signed before
+                                including it into smart installer \c .sis.
+    \row \o \c unsigned_installer_sis \o Create unsigned \l{Smart Installer}{smart installer}
+                                         \c .sis file for project.
+                                         Note: The application \c .sis contained in smart installer
+                                         \c .sis will also be unsigned.
     \row \o \c stub_sis      \o Create a stub sis to allow upgradability of projects
                                 that are deployed in ROM
 …
     by right clicking on the project explorer and executing "Import...".
+    \section2 Smart Installer
+    The Smart Installer makes sure that deployed applications have all the Qt dependencies
+    they need to run on a device.
+    Download the latest release of the Smart Installer from \l{http://get.qt.nokia.com/nokiasmartinstaller/},
+    and install it on top of the Qt package.
+    \section1 Installing your own applications
+    \section1 Running Applications from the Command Line
+    The application can be launched on the emulator using \c{make run} command.
+    The application can be launched on a device using \c{make runonphone} command.
+    When this command is invoked, a \c .sis file is first created as if \c{make sis}
+    command was invoked (see above for details).
+    \bold{Note:} Running the application on a device using this command requires
+    \c TRK application to be running on the device.
+    Additional environment variables that can be utilized with these commands are:
+    \table
+    \row \o \c QT_RUN_OPTIONS           \o Any command line parameters you wish to pass
+                                           to your application.
+    \row \o \c QT_RUN_ON_PHONE_OPTIONS  \o Options for runonphone application.
+                                           Execute \c runonphone from command line for
+                                           more information about available options.
+                                           \c{make runonphone} only.
+    \endtable
+    \section1 Installing Your Own Applications
     To install your own applications on hardware, you need a signed \c .sis file.
+    (Refer to the \l{http://developer.symbian.org/wiki/index.php/Platform_Security_%28Fundamentals_of_Symbian_C%2B%2B%29#Self-Signed_Applications}
+    {Platform Security Article} for more informations about self-signing.)
+    (Refer to the \l{Symbian Platform Security} article for more informations about self-signing.)
     The signed \c .sis file can be created with \c make \c sis target. \c sis target
     is only supported for executables or projects with \c DEPLOYMENT statements.
 …
     \endtable
     The suppported options for \c QT_SIS_OPTIONS:
+    The supported options for \c QT_SIS_OPTIONS:
     \target Supported options for QT_SIS_OPTIONS
 …
     \row \o -i                  \o Install the package right away using PC suite.
     \row \o -p                  \o Only preprocess the template \c .pkg file.
+    \row \o -c=<file>           \o Read certificate information from a file.
+    \row \o -c <file>           \o Read certificate information from a file.
+    \row \o -u                  \o Preserves unsigned package.
+    \row \o -o                  \o Creates only unsigned package.
+    \row \o -s                  \o Generates stub sis for ROM.
+    \row \o -n <name>           \o Specifies the final sis name.
+    \row \o -g                  \o Treat gcce platform as armv5.
+    \row \o -d                  \o Skip automatic patching of the package when default certificate is used.
     \endtable
     Execute the \c{createpackage.pl} script without any
     parameters for detailed information about options. By default no otions are given.
+    parameters for detailed information about options. By default no options are given.
     For example:
 …
     \snippet doc/src/snippets/code/doc_src_symbian-introduction.qdoc 3
     If you want to install the program immediately, make sure that the device
     is connected to the computer in "PC Suite" mode, and run \c sis target
     with the \c QT_SIS_OPTIONS=-i, like this:
+    If you want to install the program immediately after creating \c .sis file,
+    make sure that the device is connected to the computer in "PC Suite" mode,
+    and use \c deploy target instead of \c sis target:
     \snippet doc/src/snippets/code/doc_src_symbian-introduction.qdoc 5
+    \section1 Running applications from command line
+    The application can be launched on the emulator using \c{make run} command.
+    The application can be launched on a device using \c{make runonphone} command.
+    When this command is invoked, a \c .sis file is first created as if \c{make sis}
+    command was invoked (see above for details).
+    \bold{Note:} Running the application on a device using this command requires
+    \c TRK application to be running on the device.
+    Additional environment variables that can be utilized with these commands are:
+    \table
+    \row \o \c QT_RUN_OPTIONS           \o Any command line parameters you wish to pass
+                                           to your application.
+    \row \o \c QT_RUN_ON_PHONE_OPTIONS  \o Options for runonphone application.
+                                           Execute \c runonphone from command line for
+                                           more information about available options.
+                                           \c{make runonphone} only.
+    \endtable
+    \section1 Deployment and the Smart Installer
+    Although some Symbian devices may already have a version of Qt installed
+    on them, there needs to be a way to ensure that an appropriate version
+    of Qt is available for your application to use. Rather than deploy the
+    required Qt libraries with your application, the preferred way to
+    package Qt applications for deployment is to download and use the Smart
+    Installer.
+    The Smart Installer makes sure that deployed applications have all the
+    Qt dependencies they need to run on a device, performing the necessary
+    updates when the user installs the application.
+    More information about deployment can be found in the
+    \l{Deploying an Application on the Symbian Platform} document.
 */

trunk/doc/src/platforms/wince-customization.qdoc

-              r769
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** 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:LGPL$
+** $QT_BEGIN_LICENSE:FDL$
 ** Commercial Usage
 ** Licensees holding valid Qt Commercial licenses may use this file in
 ** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** 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.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+** Software or, alternatively, in accordance with the terms contained in a
+** written agreement between you and Nokia.
+**
+** 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
 …
     When working with a custom SDK for Windows CE, Qt provides an easy way
     to add support for it to your development environment. The following is
     a tutorial that covers how to create a specification for Qt on Windows
+    a tutorial that covers how to create a specification for Qt for Windows
     CE platforms.
 …
     \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.3} the shadow build directory
+    If the Qt package is in \c{C:\Qt\4.7.2} the shadow build directory
     could be \c{C:\Qt\shadowbuild}. A shadow build from a directory like
     \c{C:\shadowbuild} will not compile.
 …
     \endlist
     So lets assume you have installed Qt in \c{C:\Qt\4.6.3} and you want
+    So lets assume you have installed Qt in \c{C:\Qt\4.7.2} and you want
     to create a shadow build in \c{C:\Qt\mobile5-shadow}:

trunk/doc/src/platforms/wince-introduction.qdoc

-              r651
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** 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:LGPL$
+** $QT_BEGIN_LICENSE:FDL$
 ** Commercial Usage
 ** Licensees holding valid Qt Commercial licenses may use this file in
 ** accordance with the Qt Commercial License Agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and Nokia.
+** Software or, alternatively, in accordance with the terms contained in a
+** written agreement between you and Nokia.
 **
+** 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.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+** 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
 …
     \title Qt for Windows CE
     \ingroup qt-embedded
     \brief Documents related to Qt on Windows CE
+    \brief Documents related to Qt for Windows CE
     Qt for Windows CE is a C++ framework for GUI and application development
 …
      \list
         \o \l {Qt for Windows CE Requirements}
         \o \l {Installing Qt on Windows CE}
+        \o \l {Installing Qt for Windows CE}
         \o \l {Windows CE - Introduction to using Qt}{Introduction to using Qt}
     \endlist
 …
     \section1 Installing Qt
     Follow the instructions found in \l{Installing Qt on Windows CE}.
+    Follow the instructions found in \l{Installing Qt for Windows CE}.
     \section1 Building your own applications

trunk/doc/src/platforms/wince-opengl.qdoc

-              r651
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** 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:LGPL$
+** $QT_BEGIN_LICENSE:FDL$
 ** Commercial Usage
 ** Licensees holding valid Qt Commercial licenses may use this file in
 ** accordance with the Qt Commercial License Agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and Nokia.
+** Software or, alternatively, in accordance with the terms contained in a
+** written agreement between you and Nokia.
 **
+** 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.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+** 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
 …
 \section2 Configure
 To configure Qt for Windows Mobile 5.0 and OpenGL ES Common Lite support
+To configure Qt for Windows Mobile 5.0 and OpenGL ES Common support
 you can run \c{configure} like this:
 …
 The floating point profile is called OpenGL ES CM (Common) and the
 fixed-point profile is called OpenGL ES CL (Common Lite).
+The fixed-point profile is no longer supported since Qt 4.7.
 You can run \c{configure} with the \c{-opengl-es-cm} option for the Common
+profile or \c{-opengl-es-cl} for the Common Lite profile. In both cases,
+ensure that the \c{lib} and \c{includes} paths include the OpenGL ES
+profile.  Ensure that the \c{lib} and \c{includes} paths include the OpenGL ES
 headers and libararies from your SDK. The OpenGL ES lib should be called
+either \c{libGLES_CM.lib} for the Common profile or \c{libGLES_CL.lib} for
+the Common Lite profile.
+The distinction between the Common and Common Lite profiles is important,
+because the Common Lite profile has less functionality and only supports a
+fixed-point vertex format.
+either \c{libGLES_CM.lib} for the Common profile.
 To start programming with Qt and OpenGL ES on Windows CE, you can start

trunk/doc/src/platforms/wince-openvg.qdoc

-              r651
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** 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:LGPL$
+** $QT_BEGIN_LICENSE:FDL$
 ** Commercial Usage
 ** Licensees holding valid Qt Commercial licenses may use this file in
 ** accordance with the Qt Commercial License Agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and Nokia.
+** Software or, alternatively, in accordance with the terms contained in a
+** written agreement between you and Nokia.
 **
+** 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.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+** 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

trunk/doc/src/platforms/wince-signing.qdoc

-              r651
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** 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:LGPL$
+** $QT_BEGIN_LICENSE:FDL$
 ** Commercial Usage
 ** Licensees holding valid Qt Commercial licenses may use this file in
 ** accordance with the Qt Commercial License Agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and Nokia.
+** Software or, alternatively, in accordance with the terms contained in a
+** written agreement between you and Nokia.
 **
+** 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.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+** 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

trunk/doc/src/platforms/winsystem.qdoc

-              r651
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** 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:LGPL$
+** $QT_BEGIN_LICENSE:FDL$
 ** Commercial Usage
 ** Licensees holding valid Qt Commercial licenses may use this file in
 ** accordance with the Qt Commercial License Agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and Nokia.
+** Software or, alternatively, in accordance with the terms contained in a
+** written agreement between you and Nokia.
 **
+** 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.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+** 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
 …
     For information about which platforms are supported by Qt, see the
     \l{Platform Notes}. For information on distributing Qt applications, see
     \l{Deploying Qt Applications}.
+    \l{Platform and Compiler Notes}. For information on distributing Qt
+    applications, see \l{Deploying Qt Applications}.
     \target x11

trunk/doc/src/platforms/x11overlays.qdoc

-              r651
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** 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:LGPL$
+** $QT_BEGIN_LICENSE:FDL$
 ** Commercial Usage
 ** Licensees holding valid Qt Commercial licenses may use this file in
 ** accordance with the Qt Commercial License Agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and Nokia.
+** Software or, alternatively, in accordance with the terms contained in a
+** written agreement between you and Nokia.
 **
+** 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.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+** 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
 …
     \page x11overlays.html
     \title How to Use X11 Overlays with Qt
+        \ingroup best-practices
     X11 overlays are a powerful mechanism for drawing

/branches/vendor/nokia/qt/4.7.2 (added)	merged: 845
/branches/vendor/nokia/qt/current	merged: 844
/branches/vendor/nokia/qt/4.6.3	removed

Context Navigation

Legend:

Download in other formats: