Merge branch '4.6'

Conflicts:
	bin/syncqt
	doc/src/deployment/deployment.qdoc
	src/corelib/io/qfsfileengine_win.cpp
	src/corelib/xml/qxmlstream.cpp
	src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
	tools/assistant/tools/assistant/centralwidget.cpp
	tools/linguist/lupdate/main.cpp

20 files changed, 64 insertions, 51 deletions

diff --git a/src/corelib/global/qconfig-dist.h b/src/corelib/global/qconfig-dist.h
index 91d2a89..9f7d05d 100644
--- a/src/corelib/global/qconfig-dist.h
+++ b/src/corelib/global/qconfig-dist.h
@@ -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/src/corelib/global/qconfig-large.h b/src/corelib/global/qconfig-large.h
index bc710c8..b22a4d2 100644
--- a/src/corelib/global/qconfig-large.h
+++ b/src/corelib/global/qconfig-large.h
@@ -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/src/corelib/global/qconfig-medium.h b/src/corelib/global/qconfig-medium.h
index 728c058..ccd6759 100644
--- a/src/corelib/global/qconfig-medium.h
+++ b/src/corelib/global/qconfig-medium.h
@@ -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/src/corelib/global/qconfig-minimal.h b/src/corelib/global/qconfig-minimal.h
index 58565d6..99b16e8 100644
--- a/src/corelib/global/qconfig-minimal.h
+++ b/src/corelib/global/qconfig-minimal.h
@@ -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/src/corelib/global/qconfig-small.h b/src/corelib/global/qconfig-small.h
index a80d4f1..1716b8d 100644
--- a/src/corelib/global/qconfig-small.h
+++ b/src/corelib/global/qconfig-small.h
@@ -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/src/corelib/global/qendian.h b/src/corelib/global/qendian.h
index 5d9141f..107854c 100644
--- a/src/corelib/global/qendian.h
+++ b/src/corelib/global/qendian.h
@@ -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/src/corelib/global/qendian.qdoc b/src/corelib/global/qendian.qdoc
index 236ab6c..ea065cb 100644
--- a/src/corelib/global/qendian.qdoc
+++ b/src/corelib/global/qendian.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/src/corelib/global/qfeatures.h b/src/corelib/global/qfeatures.h
index 1c52d4c..acb3a00 100644
--- a/src/corelib/global/qfeatures.h
+++ b/src/corelib/global/qfeatures.h
@@ -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/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp
index dfe610c..f48c1b3 100644
--- a/src/corelib/global/qglobal.cpp
+++ b/src/corelib/global/qglobal.cpp
@@ -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/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index 573626d..d5cee07 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -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/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
index 77a86bb..a9ea44a 100644
--- a/src/corelib/global/qlibraryinfo.cpp
+++ b/src/corelib/global/qlibraryinfo.cpp
@@ -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)
 **
@@ -494,7 +494,7 @@ extern "C" void qt_core_boilerplate();
 void qt_core_boilerplate()
 {
     printf("This is the QtCore library version " QT_VERSION_STR "\n"
-           "Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).\n"
+           "Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).\n"
            "Contact: Nokia Corporation (qt-info@nokia.com)\n"
            "\n"
            "Build key:           " QT_BUILD_KEY "\n"
diff --git a/src/corelib/global/qlibraryinfo.h b/src/corelib/global/qlibraryinfo.h
index f65051d..e64b760 100644
--- a/src/corelib/global/qlibraryinfo.h
+++ b/src/corelib/global/qlibraryinfo.h
@@ -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/src/corelib/global/qmalloc.cpp b/src/corelib/global/qmalloc.cpp
index 4aab1bd..43e89e3 100644
--- a/src/corelib/global/qmalloc.cpp
+++ b/src/corelib/global/qmalloc.cpp
@@ -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/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h
index c40308c..38e1886 100644
--- a/src/corelib/global/qnamespace.h
+++ b/src/corelib/global/qnamespace.h
@@ -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/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc
index 5a80d56..871dd5c 100644
--- a/src/corelib/global/qnamespace.qdoc
+++ b/src/corelib/global/qnamespace.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)
 **
@@ -514,45 +514,58 @@
 /*!
     \enum Qt::ConnectionType
 
-    This enum describes the types of connection that can be used between signals and
-    slots. In particular, it determines whether a particular signal is delivered to a
-    slot immediately or queued for delivery at a later time.
+    This enum describes the types of connection that can be used
+    between signals and slots. In particular, it determines whether a
+    particular signal is delivered to a slot immediately or queued for
+    delivery at a later time.
+
+    \value AutoConnection
+    	   (default) Same as DirectConnection, if the emitter and
+       	   receiver are in the same thread. Same as QueuedConnection,
+       	   if the emitter and receiver are in different threads.
+
+    \value DirectConnection  
+	   The slot is invoked immediately, when the signal is
+       	   emitted.
+
+    \value QueuedConnection  
+    	   The slot is invoked when control returns to the event loop
+       	   of the receiver's thread. The slot is executed in the
+       	   receiver's thread.
 
-    \value DirectConnection  When emitted, the signal is immediately delivered to the slot.
-    \value QueuedConnection  When emitted, the signal is queued until the event loop is
-                             able to deliver it to the slot.
     \value BlockingQueuedConnection
-                             Same as QueuedConnection, except that the current thread blocks
-                             until the slot has been delivered. This connection type should
-                             only be used for receivers in a different thread. Note that misuse
-                             of this type can lead to deadlocks in your application.
-    \value AutoConnection    If the signal is emitted from the thread
-                             in which the receiving object lives, the
-                             slot is invoked directly, as with
-                             Qt::DirectConnection; otherwise the
-                             signal is queued, as with
-                             Qt::QueuedConnection.
-    \value UniqueConnection  Same as AutoConnection, but there will be a check that the signal is
-                             not already connected to the same slot before connecting, otherwise,
-                             the connection will fail.
-                             This value was introduced in Qt 4.6.
+           Same as QueuedConnection, except the current thread blocks
+           until the slot returns. This connection type should only be
+           used where the emitter and receiver are in different
+           threads.  \note Violating this rule can cause your
+           application to deadlock.
+
+    \value UniqueConnection
+           Same as AutoConnection, but the connection is made only if
+    	   it does not duplicate an existing connection. i.e., if the
+    	   same signal is already connected to the same slot for the
+    	   same pair of objects, then the connection will fail. This
+    	   connection type was introduced in Qt 4.6.
+
     \value AutoCompatConnection
-           The default connection type for signals and slots when Qt 3 support
-           is enabled. Equivalent to AutoConnection for connections but will cause warnings
-           to be output under certain circumstances. See
-           \l{Porting to Qt 4#Compatibility Signals and Slots}{Compatibility Signals and Slots}
-           for further information.
+    	   The default type when Qt 3 support is enabled. Same as
+	   AutoConnection but will also cause warnings to be output in
+	   certain situations. See \l{Porting to Qt 4#Compatibility
+	   Signals and Slots}{Compatibility Signals and Slots} for
+	   further information.
 
-    With queued connections, the parameters must be of types that are known to
-    Qt's meta-object system, because Qt needs to copy the arguments to store them
-    in an event behind the scenes. If you try to use a queued connection and
-    get the error message
+    With queued connections, the parameters must be of types that are
+    known to Qt's meta-object system, because Qt needs to copy the
+    arguments to store them in an event behind the scenes. If you try
+    to use a queued connection and get the error message:
 
     \snippet doc/src/snippets/code/doc_src_qnamespace.qdoc 0
 
-    call qRegisterMetaType() to register the data type before you
+    Call qRegisterMetaType() to register the data type before you
     establish the connection.
 
+    When using signals and slots with multiple threads, see \l{Signals and Slots Across Threads}.
+
     \sa {Thread Support in Qt}, QObject::connect(), qRegisterMetaType()
 */
 
diff --git a/src/corelib/global/qnumeric.cpp b/src/corelib/global/qnumeric.cpp
index c7073d9..75fd31e 100644
--- a/src/corelib/global/qnumeric.cpp
+++ b/src/corelib/global/qnumeric.cpp
@@ -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/src/corelib/global/qnumeric.h b/src/corelib/global/qnumeric.h
index bc1c418..af5d722 100644
--- a/src/corelib/global/qnumeric.h
+++ b/src/corelib/global/qnumeric.h
@@ -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/src/corelib/global/qnumeric_p.h b/src/corelib/global/qnumeric_p.h
index c8b5735..7691a8d 100644
--- a/src/corelib/global/qnumeric_p.h
+++ b/src/corelib/global/qnumeric_p.h
@@ -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/src/corelib/global/qt_pch.h b/src/corelib/global/qt_pch.h
index b3a08b5..59dfc28 100644
--- a/src/corelib/global/qt_pch.h
+++ b/src/corelib/global/qt_pch.h
@@ -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/src/corelib/global/qt_windows.h b/src/corelib/global/qt_windows.h
index a7c3f8c..13952f0 100644
--- a/src/corelib/global/qt_windows.h
+++ b/src/corelib/global/qt_windows.h
@@ -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)
 **