1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move QFutureSynchronizer back to QtCore

Browse Source 
This class, too, belongs with QFuture.

Change-Id: I41a532ca66c156f1631e4b22ffc1a5879c854488
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Marc Mutz 2012-08-27 23:22:15 +02:00 committed by The Qt Project
parent 08c50599f1
commit 7d21abfca3
9 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/concurrent/concurrent.pro
View File

@ -12,7 +12,6 @@ load(qt_module)
PRECOMPILED_HEADER = ../corelib/global/qt_pch.h PRECOMPILED_HEADER = ../corelib/global/qt_pch.h
SOURCES += \ SOURCES += \
qfuturesynchronizer.cpp \
qtconcurrentfilter.cpp \ qtconcurrentfilter.cpp \
qtconcurrentmap.cpp \ qtconcurrentmap.cpp \
qtconcurrentthreadengine.cpp \ qtconcurrentthreadengine.cpp \
@ -20,7 +19,6 @@ SOURCES += \
HEADERS += \ HEADERS += \
qtconcurrent_global.h \ qtconcurrent_global.h \
qfuturesynchronizer.h \
qtconcurrentcompilertest.h \ qtconcurrentcompilertest.h \
qtconcurrentexception.h \ qtconcurrentexception.h \
qtconcurrentfilter.h \ qtconcurrentfilter.h \

0
src/concurrent/doc/snippets/code/src_concurrent_qfuturesynchronizer.cpp → src/corelib/doc/snippets/code/src_corelib_thread_qfuturesynchronizer.cpp
View File

6
src/concurrent/qfuturesynchronizer.h → src/corelib/thread/qfuturesynchronizer.h
View File

@ -42,11 +42,9 @@
#ifndef QFUTURESYNCHRONIZER_H #ifndef QFUTURESYNCHRONIZER_H
#define QFUTURESYNCHRONIZER_H #define QFUTURESYNCHRONIZER_H
#include <QtConcurrent/qtconcurrent_global.h>
#include <QtCore/qfuture.h> #include <QtCore/qfuture.h>
#ifndef QT_NO_CONCURRENT #ifndef QT_NO_QFUTURE
QT_BEGIN_HEADER QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
@ -117,6 +115,6 @@ protected:
QT_END_NAMESPACE QT_END_NAMESPACE
QT_END_HEADER QT_END_HEADER
#endif // QT_NO_CONCURRENT #endif // QT_NO_QFUTURE
#endif // QFUTURESYNCHRONIZER_H #endif // QFUTURESYNCHRONIZER_H

2
src/concurrent/qfuturesynchronizer.cpp → src/corelib/thread/qfuturesynchronizer.qdoc
View File

@ -57,7 +57,7 @@
an easy way to ensure that all futures have finished before returning from an easy way to ensure that all futures have finished before returning from
a function: a function:
\snippet code/src_concurrent_qfuturesynchronizer.cpp 0 \snippet code/src_corelib_thread_qfuturesynchronizer.cpp 0
The behavior of waitForFinished() can be changed using the The behavior of waitForFinished() can be changed using the
setCancelOnWait() function. Calling setCancelOnWait(true) will cause setCancelOnWait() function. Calling setCancelOnWait(true) will cause

1
src/corelib/thread/thread.pri
View File

@ -14,6 +14,7 @@ HEADERS += thread/qmutex.h \
thread/qresultstore.h \ thread/qresultstore.h \
thread/qfuture.h \ thread/qfuture.h \
thread/qfutureinterface.h \ thread/qfutureinterface.h \
thread/qfuturesynchronizer.h \
thread/qfuturewatcher.h \ thread/qfuturewatcher.h \
thread/qbasicatomic.h \ thread/qbasicatomic.h \
thread/qgenericatomic.h \ thread/qgenericatomic.h \

1
tests/auto/concurrent/concurrent.pro
View File

@ -1,6 +1,5 @@
TEMPLATE=subdirs TEMPLATE=subdirs
SUBDIRS=\ SUBDIRS=\
qfuturesynchronizer \
qtconcurrentfilter \ qtconcurrentfilter \
qtconcurrentiteratekernel \ qtconcurrentiteratekernel \
qtconcurrentmap \ qtconcurrentmap \

0
tests/auto/concurrent/qfuturesynchronizer/qfuturesynchronizer.pro → tests/auto/corelib/thread/qfuturesynchronizer/qfuturesynchronizer.pro
View File

2
tests/auto/concurrent/qfuturesynchronizer/tst_qfuturesynchronizer.cpp → tests/auto/corelib/thread/qfuturesynchronizer/tst_qfuturesynchronizer.cpp
View File

@ -41,7 +41,7 @@
#include <QtTest> #include <QtTest>
#include <QtConcurrent/qfuturesynchronizer.h> #include <QtCore/qfuturesynchronizer.h>
#include <QtCore/qfuture.h> #include <QtCore/qfuture.h>
class tst_QFutureSynchronizer : public QObject class tst_QFutureSynchronizer : public QObject

1
tests/auto/corelib/thread/thread.pro
View File

@ -4,6 +4,7 @@ SUBDIRS=\
qatomicpointer \ qatomicpointer \
qresultstore \ qresultstore \
qfuture \ qfuture \
qfuturesynchronizer \
qfuturewatcher \ qfuturewatcher \
qmutex \ qmutex \
qmutexlocker \ qmutexlocker \