summaryrefslogtreecommitdiffstats
path: root/src/concurrent/qfutureinterface_p.h
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@kdab.com>2012-08-27 17:23:33 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-09-28 23:50:10 +0200
commita65a98399bf45924eb4d9394cf1e905b489639cc (patch)
treedab81fdde3c50e9b160936a9527b7172a85e4ad3 /src/concurrent/qfutureinterface_p.h
parent3a29976eac1ff95e663d49886dc82611a175fed9 (diff)
Move QtConcurrent::ResultStore as QtPrivate::ResultStore to QtCore
No compatibility header needed. While this wasn't marked as private API, it wasn't documented, either. This is a prerequisite for moving QFuture to QtCore. Change-Id: I8e986e6e2a22fbe5cf08d0600ec39ae9ae993e20 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/concurrent/qfutureinterface_p.h')
-rw-r--r--src/concurrent/qfutureinterface_p.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/concurrent/qfutureinterface_p.h b/src/concurrent/qfutureinterface_p.h
index 734584adad..7fd2ea4d99 100644
--- a/src/concurrent/qfutureinterface_p.h
+++ b/src/concurrent/qfutureinterface_p.h
@@ -142,7 +142,7 @@ public:
QElapsedTimer progressTime;
QWaitCondition pausedWaitCondition;
int pendingResults;
- QtConcurrent::ResultStoreBase m_results;
+ QtPrivate::ResultStoreBase m_results;
bool manualProgress;
int m_expectedResultCount;
QtPrivate::ExceptionStore m_exceptionStore;