From a65a98399bf45924eb4d9394cf1e905b489639cc Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Mon, 27 Aug 2012 17:23:33 +0200 Subject: 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 --- src/concurrent/qfutureinterface_p.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/concurrent/qfutureinterface_p.h') 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; -- cgit v1.2.3