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

3 files changed, 60 insertions, 12 deletions

diff --git a/doc/src/deployment/deployment.qdoc b/doc/src/deployment/deployment.qdoc
index 9234055..8ba106c 100644
--- a/doc/src/deployment/deployment.qdoc
+++ b/doc/src/deployment/deployment.qdoc
@@ -110,6 +110,7 @@
         \o \l {QtXmlPatterns}
         \o \l {Phonon Module}{Phonon}
         \o \l {Qt3Support}
+        \o
     \endtable
 
     Since Qt is not a system library, it has to be redistributed along
@@ -117,10 +118,15 @@
     of the libraries used by the application.  Using static linking,
     however, the Qt run-time is compiled into the executable.
 
-    In particular, you will need to deploy Qt plugins, such as
-    JPEG support or SQL drivers. For more information about plugins,
-    see the \l {plugins-howto.html}{How to Create Qt Plugins}
-    documentation.
+    In general, you should deploy all plugins that your build of Qt uses,
+    excluding only those that you have identified as being unnecessary
+    for your application and its users.
+
+    For instance, you may need to deploy plugins for JPEG support and
+    SQL drivers, but you should also deploy plugins that your users may
+    require, including those for accessibility.
+    For more information about plugins, see the
+    \l{plugins-howto.html}{How to Create Qt Plugins} documentation.
 
     When deploying an application using the shared library approach
     you must ensure that the Qt libraries will use the correct path to
diff --git a/doc/src/modules.qdoc b/doc/src/modules.qdoc
index 1a16609..298e0be 100644
--- a/doc/src/modules.qdoc
+++ b/doc/src/modules.qdoc
@@ -996,9 +996,9 @@
     \brief Describes the use and license of the qtmain helper library.
 
     qtmain is a helper library that enables the developer to write a
-    cross-platform main() function on Windows. If you do not use \l qmake
-    or other build tools such as CMake, then you need to link against
-    the \c qtmain library.
+    cross-platform main() function on Windows and on the Symbian platform.
+    If you do not use \l qmake or other build tools such as CMake, then you
+    need to link against the \c qtmain library.
 
     \section1 License Information
 
@@ -1011,9 +1011,9 @@
     Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).\br
     All rights reserved.
 
-    Contact:  Nokia Corporation (qt-info@nokia.com)\br
+    Contact:  Nokia Corporation (qt-info@nokia.com)
 
-    You may use this file under the terms of the BSD license as follows:\br
+    You may use this file under the terms of the BSD license as follows:
 
     "Redistribution and use in source and binary forms, with or without modification,
     are permitted provided that the following conditions are met:
@@ -1037,6 +1037,48 @@
     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
     \endlegalese
+
+    The contents of the \c{qts60main.cpp} and \c{qts60main_mcrt0.cpp} files,
+    located in the \c{src/s60main} directory are not covered by the
+    \l{GNU General Public License (GPL)}, the
+    \l{GNU Lesser General Public License (LGPL)}, or the
+    \l{Qt Commercial Editions}{Qt Commercial License}. Instead, they are
+    distributed under the following license.
+    
+    \legalese
+    Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).\br
+    All rights reserved.\br
+    Contact: Nokia Corporation (qt-info@nokia.com)
+
+    This file is part of the Symbian application wrapper of the Qt Toolkit.
+
+    You may use this file under the terms of the BSD license as follows:
+
+    "Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are
+    met:\br
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.\br
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.\br
+      * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+        the names of its contributors may be used to endorse or promote
+        products derived from this software without specific prior written
+        permission.
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+    IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+    THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+    PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+    CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+    EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+    PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+    PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+    \endlegalese
 */
 
 /*!
diff --git a/doc/src/snippets/audio/main.cpp b/doc/src/snippets/audio/main.cpp
index 0e804ea..f000075 100644
--- a/doc/src/snippets/audio/main.cpp
+++ b/doc/src/snippets/audio/main.cpp
@@ -89,9 +89,9 @@ private:
     {
 //![1]
         QAudioFormat format;
-        format.setFrequency(44100);
+        format.setSampleRate(44100);
 //![1]
-        format.setChannels(2);
+        format.setChannelCount(2);
         format.setSampleSize(16);
         format.setCodec("audio/pcm");
         format.setByteOrder(QAudioFormat::LittleEndian);
@@ -112,7 +112,7 @@ public slots:
         switch (newState) {
             case QAudio::StopState:
                 if (output->error() != QAudio::NoError) {
-                    // Do your error handlin
+                    // Perform error handling
                 } else {
                     // Normal stop
                 }