diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2013-09-19 15:46:34 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-20 23:45:06 +0200 |
| commit | ef5455429f30ec9c8236e5240ed8f96af6ca9271 (patch) | |
| tree | 3e5c5b5bd40813b57e19f53bbea15eb467505c04 /src/corelib | |
| parent | eec956711106c3c488d94466485eaefe0d1e4dd8 (diff) | |
QFutureInterface: remove unused member variable 'pendingResults'
Change-Id: I059580831ed29a53186272283aa7695c57539eed
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/thread/qfutureinterface.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/thread/qfutureinterface_p.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/corelib/thread/qfutureinterface.cpp b/src/corelib/thread/qfutureinterface.cpp index 0f7d04a7c5..2a79a501e3 100644 --- a/src/corelib/thread/qfutureinterface.cpp +++ b/src/corelib/thread/qfutureinterface.cpp @@ -432,7 +432,7 @@ bool QFutureInterfaceBase::derefT() const QFutureInterfaceBasePrivate::QFutureInterfaceBasePrivate(QFutureInterfaceBase::State initialState) : refCount(1), m_progressValue(0), m_progressMinimum(0), m_progressMaximum(0), - state(initialState), pendingResults(0), + state(initialState), manualProgress(false), m_expectedResultCount(0), runnable(0) { progressTime.invalidate(); diff --git a/src/corelib/thread/qfutureinterface_p.h b/src/corelib/thread/qfutureinterface_p.h index a638fbeaa6..8b38ebfc66 100644 --- a/src/corelib/thread/qfutureinterface_p.h +++ b/src/corelib/thread/qfutureinterface_p.h @@ -163,7 +163,6 @@ public: QFutureInterfaceBase::State state; QElapsedTimer progressTime; QWaitCondition pausedWaitCondition; - int pendingResults; QtPrivate::ResultStoreBase m_results; bool manualProgress; int m_expectedResultCount; |