Changeset 769 for trunk/src/corelib/concurrent

Timestamp:

Aug 2, 2010, 9:27:30 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

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

Location:

trunk

Files:

• . (modified) (1 prop)
• src/corelib/concurrent/qfuture.h (modified) (1 diff)
• src/corelib/concurrent/qfuturewatcher.cpp (modified) (1 diff)

trunk/src/corelib/concurrent/qfuture.h

@@ -112 +112 @@
     public:
         typedef std::bidirectional_iterator_tag iterator_category;
-        typedef ptrdiff_t difference_type;
+        typedef  difference_type;
         typedef T value_type;
         typedef const T *pointer;

trunk/src/corelib/concurrent/qfuturewatcher.cpp

@@ -500 +500 @@
 
     Starts watching the given \a future.
+
+
+
+
+
+
+
 */