diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2012-08-27 12:24:48 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-09-28 23:50:10 +0200 |
| commit | 3a29976eac1ff95e663d49886dc82611a175fed9 (patch) | |
| tree | 31d70d25501a0f95e17b65e4c029c5c40b75610f /src/concurrent/qfutureinterface_p.h | |
| parent | 5414a9a03bec65fd180f3c29811397df14130881 (diff) | |
Move QtConcurrent::Exception as QException back to QtCore
Leave the old name as a deprecated typedef; adapt users.
This is a prerequisite for moving QFuture back to QtCore.
Change-Id: I81dcee2c7e6eb234c16f3f42e2415ca0da3dc4f8
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/concurrent/qfutureinterface_p.h')
| -rw-r--r-- | src/concurrent/qfutureinterface_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/concurrent/qfutureinterface_p.h b/src/concurrent/qfutureinterface_p.h index e4c5d369aa..734584adad 100644 --- a/src/concurrent/qfutureinterface_p.h +++ b/src/concurrent/qfutureinterface_p.h @@ -145,7 +145,7 @@ public: QtConcurrent::ResultStoreBase m_results; bool manualProgress; int m_expectedResultCount; - QtConcurrent::internal::ExceptionStore m_exceptionStore; + QtPrivate::ExceptionStore m_exceptionStore; QString m_progressText; QRunnable *runnable; |