diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2012-08-27 18:33:55 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-09-28 23:50:10 +0200 |
| commit | 727f25214e870bc5d947a2f89ada9a4a4bd07365 (patch) | |
| tree | 14a2dec27238c51fdd8a78144df07575064e618e /src/concurrent/qtconcurrent_global.h | |
| parent | f7a33ec29f1278f6937f1862e002a3f8f60a4728 (diff) | |
Move QFuture from QtConcurrent to QtCore
This class belongs to QThreadPool/QRunnable more than to QtConcurrent, so
move to QtCore, where QThreadPool awaits it.
Change-Id: Ibf20288a986593bf779453427c2dae8db1e1423a
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/concurrent/qtconcurrent_global.h')
| -rw-r--r-- | src/concurrent/qtconcurrent_global.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/concurrent/qtconcurrent_global.h b/src/concurrent/qtconcurrent_global.h index 54e70b67f8..464aa88d49 100644 --- a/src/concurrent/qtconcurrent_global.h +++ b/src/concurrent/qtconcurrent_global.h @@ -47,10 +47,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -#ifdef QT_NO_CONCURRENT -# define QT_NO_QFUTURE -#endif - #ifndef QT_STATIC # if defined(QT_BUILD_CONCURRENT_LIB) # define Q_CONCURRENT_EXPORT Q_DECL_EXPORT |