Merge remote branch 'mainline/4.6' into 4.6

Conflicts:
	tests/auto/linguist/lupdate/testlupdate.cpp

4 files changed, 14 insertions, 8 deletions

diff --git a/doc/src/deployment/deployment-plugins.qdoc b/doc/src/deployment/deployment-plugins.qdoc
index afe0500..9009a6d 100644
--- a/doc/src/deployment/deployment-plugins.qdoc
+++ b/doc/src/deployment/deployment-plugins.qdoc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff --git a/doc/src/deployment/deployment.qdoc b/doc/src/deployment/deployment.qdoc
index f2038b2..8ba106c 100644
--- a/doc/src/deployment/deployment.qdoc
+++ b/doc/src/deployment/deployment.qdoc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -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/deployment/qt-conf.qdoc b/doc/src/deployment/qt-conf.qdoc
index eee34e9..4357c88 100644
--- a/doc/src/deployment/qt-conf.qdoc
+++ b/doc/src/deployment/qt-conf.qdoc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff --git a/doc/src/deployment/qtconfig.qdoc b/doc/src/deployment/qtconfig.qdoc
index 41eb5a0..fd5d3f5 100644
--- a/doc/src/deployment/qtconfig.qdoc
+++ b/doc/src/deployment/qtconfig.qdoc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **