Changeset 846 for trunk/src/corelib/concurrent

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/corelib/concurrent/qfuture.cpp (modified) (1 diff)
• src/corelib/concurrent/qfuture.h (modified) (1 diff)
• src/corelib/concurrent/qfutureinterface.cpp (modified) (1 diff)
• src/corelib/concurrent/qfutureinterface.h (modified) (1 diff)
• src/corelib/concurrent/qfutureinterface_p.h (modified) (1 diff)
• src/corelib/concurrent/qfuturesynchronizer.cpp (modified) (1 diff)
• src/corelib/concurrent/qfuturesynchronizer.h (modified) (1 diff)
• src/corelib/concurrent/qfuturewatcher.cpp (modified) (2 diffs)
• src/corelib/concurrent/qfuturewatcher.h (modified) (1 diff)
• src/corelib/concurrent/qfuturewatcher_p.h (modified) (1 diff)
• src/corelib/concurrent/qrunnable.cpp (modified) (1 diff)
• src/corelib/concurrent/qrunnable.h (modified) (1 diff)
• src/corelib/concurrent/qtconcurrentcompilertest.h (modified) (1 diff)
• src/corelib/concurrent/qtconcurrentexception.cpp (modified) (2 diffs)
• src/corelib/concurrent/qtconcurrentexception.h (modified) (1 diff)
• src/corelib/concurrent/qtconcurrentfilter.cpp (modified) (2 diffs)
• src/corelib/concurrent/qtconcurrentfilter.h (modified) (1 diff)
• src/corelib/concurrent/qtconcurrentfilterkernel.h (modified) (1 diff)
• src/corelib/concurrent/qtconcurrentfunctionwrappers.h (modified) (1 diff)
• src/corelib/concurrent/qtconcurrentiteratekernel.cpp (modified) (1 diff)
• src/corelib/concurrent/qtconcurrentiteratekernel.h (modified) (1 diff)
• src/corelib/concurrent/qtconcurrentmap.cpp (modified) (3 diffs)
• src/corelib/concurrent/qtconcurrentmap.h (modified) (1 diff)
• src/corelib/concurrent/qtconcurrentmapkernel.h (modified) (1 diff)
• src/corelib/concurrent/qtconcurrentmedian.h (modified) (1 diff)
• src/corelib/concurrent/qtconcurrentreducekernel.h (modified) (1 diff)
• src/corelib/concurrent/qtconcurrentresultstore.cpp (modified) (2 diffs)
• src/corelib/concurrent/qtconcurrentresultstore.h (modified) (1 diff)
• src/corelib/concurrent/qtconcurrentrun.cpp (modified) (2 diffs)
• src/corelib/concurrent/qtconcurrentrun.h (modified) (1 diff)
• src/corelib/concurrent/qtconcurrentrunbase.h (modified) (1 diff)
• src/corelib/concurrent/qtconcurrentstoredfunctioncall.h (modified) (1 diff)
• src/corelib/concurrent/qtconcurrentthreadengine.cpp (modified) (1 diff)
• src/corelib/concurrent/qtconcurrentthreadengine.h (modified) (1 diff)
• src/corelib/concurrent/qthreadpool.cpp (modified) (1 diff)
• src/corelib/concurrent/qthreadpool.h (modified) (1 diff)
• src/corelib/concurrent/qthreadpool_p.h (modified) (1 diff)

trunk/src/corelib/concurrent/qfuture.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/corelib/concurrent/qfuture.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/corelib/concurrent/qfutureinterface.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/corelib/concurrent/qfutureinterface.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/corelib/concurrent/qfutureinterface_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/corelib/concurrent/qfuturesynchronizer.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/corelib/concurrent/qfuturesynchronizer.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/corelib/concurrent/qfuturewatcher.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -506 +506 @@
 
     To avoid a race condition, it is important to call this function
-    \i after doing the connections.
+    \ after doing the connections.
 */
 

trunk/src/corelib/concurrent/qfuturewatcher.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/corelib/concurrent/qfuturewatcher_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/corelib/concurrent/qrunnable.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/corelib/concurrent/qrunnable.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/corelib/concurrent/qtconcurrentcompilertest.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/corelib/concurrent/qtconcurrentexception.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -67 +67 @@
     in the receiver thread.
 
-    When using QFuture, transferred exceptions willl be thrown when calling the following functions:
+    When using QFuture, transferred exceptions will be thrown when calling the following functions:
     \list
     \o QFuture::waitForFinished()

trunk/src/corelib/concurrent/qtconcurrentexception.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/corelib/concurrent/qtconcurrentfilter.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -118 +118 @@
     variable. QtConcurrent::filteredReduced() guarantees that only one thread
     will call reduce at a time, so using a mutex to lock the result variable
-    is not neccesary. The QtConcurrent::ReduceOptions enum provides a way to
+    is not necsary. The QtConcurrent::ReduceOptions enum provides a way to
     control the order in which the reduction is done.
 

trunk/src/corelib/concurrent/qtconcurrentfilter.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/corelib/concurrent/qtconcurrentfilterkernel.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/corelib/concurrent/qtconcurrentfunctionwrappers.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/corelib/concurrent/qtconcurrentiteratekernel.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/corelib/concurrent/qtconcurrentiteratekernel.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])