Move QFuture from QtConcurrent to QtCore
authorMarc Mutz <marc.mutz@kdab.com>
Mon, 27 Aug 2012 16:33:55 +0000 (18:33 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Fri, 28 Sep 2012 21:50:10 +0000 (23:50 +0200)
commit727f25214e870bc5d947a2f89ada9a4a4bd07365
tree14a2dec27238c51fdd8a78144df07575064e618e
parentf7a33ec29f1278f6937f1862e002a3f8f60a4728
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>
21 files changed:
src/concurrent/concurrent.pro
src/concurrent/qfuturesynchronizer.h
src/concurrent/qfuturewatcher.h
src/concurrent/qfuturewatcher_p.h
src/concurrent/qtconcurrent_global.h
src/concurrent/qtconcurrentrunbase.h
src/concurrent/qtconcurrentthreadengine.h
src/corelib/doc/snippets/code/src_corelib_thread_qfuture.cpp [moved from src/concurrent/doc/snippets/code/src_concurrent_qfuture.cpp with 100% similarity]
src/corelib/thread/qfuture.h [moved from src/concurrent/qfuture.h with 99% similarity]
src/corelib/thread/qfuture.qdoc [moved from src/concurrent/qfuture.cpp with 99% similarity]
src/corelib/thread/qfutureinterface.cpp [moved from src/concurrent/qfutureinterface.cpp with 99% similarity]
src/corelib/thread/qfutureinterface.h [moved from src/concurrent/qfutureinterface.h with 98% similarity]
src/corelib/thread/qfutureinterface_p.h [moved from src/concurrent/qfutureinterface_p.h with 98% similarity]
src/corelib/thread/thread.pri
tests/auto/concurrent/concurrent.pro
tests/auto/concurrent/qfuturesynchronizer/tst_qfuturesynchronizer.cpp
tests/auto/concurrent/qfuturewatcher/qfuturewatcher.pro
tests/auto/corelib/thread/qfuture/.gitignore [moved from tests/auto/concurrent/qfuture/.gitignore with 100% similarity]
tests/auto/corelib/thread/qfuture/qfuture.pro [moved from tests/auto/concurrent/qfuture/qfuture.pro with 76% similarity]
tests/auto/corelib/thread/qfuture/tst_qfuture.cpp [moved from tests/auto/concurrent/qfuture/tst_qfuture.cpp with 99% similarity]
tests/auto/corelib/thread/thread.pro