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/concurrent.pro | |
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/concurrent.pro')
-rw-r--r-- | src/concurrent/concurrent.pro | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/concurrent/concurrent.pro b/src/concurrent/concurrent.pro index d21dff91dd..8fdd6d8cd2 100644 --- a/src/concurrent/concurrent.pro +++ b/src/concurrent/concurrent.pro @@ -12,8 +12,6 @@ load(qt_module) PRECOMPILED_HEADER = ../corelib/global/qt_pch.h SOURCES += \ - qfuture.cpp \ - qfutureinterface.cpp \ qfuturesynchronizer.cpp \ qfuturewatcher.cpp \ qtconcurrentfilter.cpp \ @@ -23,8 +21,6 @@ SOURCES += \ HEADERS += \ qtconcurrent_global.h \ - qfuture.h \ - qfutureinterface.h \ qfuturesynchronizer.h \ qfuturewatcher.h \ qtconcurrentcompilertest.h \ @@ -44,7 +40,6 @@ HEADERS += \ # private headers HEADERS += \ - qfutureinterface_p.h \ qfuturewatcher_p.h QMAKE_DOCS = $$PWD/doc/qtconcurrent.qdocconf |