diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2012-08-27 23:15:40 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-09-28 23:50:10 +0200 |
| commit | 08c50599f149b7a8d448845dcb0b171e96342784 (patch) | |
| tree | f2fa89af503e02892f4998f624606bcc0977b641 /src/corelib/thread/thread.pri | |
| parent | 727f25214e870bc5d947a2f89ada9a4a4bd07365 (diff) | |
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>
Diffstat (limited to 'src/corelib/thread/thread.pri')
| -rw-r--r-- | src/corelib/thread/thread.pri | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/corelib/thread/thread.pri b/src/corelib/thread/thread.pri index 1accffcdfe..6e341beb75 100644 --- a/src/corelib/thread/thread.pri +++ b/src/corelib/thread/thread.pri @@ -14,6 +14,7 @@ HEADERS += thread/qmutex.h \ thread/qresultstore.h \ thread/qfuture.h \ thread/qfutureinterface.h \ + thread/qfuturewatcher.h \ thread/qbasicatomic.h \ thread/qgenericatomic.h \ thread/qoldbasicatomic.h @@ -22,6 +23,7 @@ HEADERS += thread/qmutex.h \ HEADERS += thread/qmutex_p.h \ thread/qmutexpool_p.h \ thread/qfutureinterface_p.h \ + thread/qfuturewatcher_p.h \ thread/qorderedmutexlocker_p.h \ thread/qreadwritelock_p.h \ thread/qthread_p.h \ @@ -31,6 +33,7 @@ SOURCES += thread/qatomic.cpp \ thread/qexception.cpp \ thread/qresultstore.cpp \ thread/qfutureinterface.cpp \ + thread/qfuturewatcher.cpp \ thread/qmutex.cpp \ thread/qreadwritelock.cpp \ thread/qrunnable.cpp \ |