Move QFutureWatcher back to QtCore
authorMarc Mutz <marc.mutz@kdab.com>
Mon, 27 Aug 2012 21:15:40 +0000 (23:15 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Fri, 28 Sep 2012 21:50:10 +0000 (23:50 +0200)
commit08c50599f149b7a8d448845dcb0b171e96342784
treef2fa89af503e02892f4998f624606bcc0977b641
parent727f25214e870bc5d947a2f89ada9a4a4bd07365
Move QFutureWatcher back to QtCore

This belongs with QFuture.

Change-Id: I555cd01c1d3890fbbaca4fd8a9170292ea4eb0fb
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 files changed:
src/concurrent/concurrent.pro
src/corelib/doc/snippets/code/src_corelib_thread_qfuturewatcher.cpp [moved from src/concurrent/doc/snippets/code/src_concurrent_qfuturewatcher.cpp with 100% similarity]
src/corelib/thread/qfutureinterface_p.h
src/corelib/thread/qfuturewatcher.cpp [moved from src/concurrent/qfuturewatcher.cpp with 99% similarity]
src/corelib/thread/qfuturewatcher.h [moved from src/concurrent/qfuturewatcher.h with 97% similarity]
src/corelib/thread/qfuturewatcher_p.h [moved from src/concurrent/qfuturewatcher_p.h with 97% similarity]
src/corelib/thread/thread.pri
tests/auto/concurrent/concurrent.pro
tests/auto/corelib/thread/qfuturewatcher/.gitignore [moved from tests/auto/concurrent/qfuturewatcher/.gitignore with 100% similarity]
tests/auto/corelib/thread/qfuturewatcher/qfuturewatcher.pro [moved from tests/auto/concurrent/qfuturewatcher/qfuturewatcher.pro with 100% similarity]
tests/auto/corelib/thread/qfuturewatcher/tst_qfuturewatcher.cpp [moved from tests/auto/concurrent/qfuturewatcher/tst_qfuturewatcher.cpp with 100% similarity]
tests/auto/corelib/thread/thread.pro