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.cpp | |
| 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.cpp')
| -rw-r--r-- | src/concurrent/qfutureinterface.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/concurrent/qfutureinterface.cpp b/src/concurrent/qfutureinterface.cpp index 5fc08c9366..1f675525a5 100644 --- a/src/concurrent/qfutureinterface.cpp +++ b/src/concurrent/qfutureinterface.cpp @@ -238,7 +238,7 @@ void QFutureInterfaceBase::reportCanceled() } #ifndef QT_NO_EXCEPTIONS -void QFutureInterfaceBase::reportException(const QtConcurrent::Exception &exception) +void QFutureInterfaceBase::reportException(const QException &exception) { QMutexLocker locker(&d->m_mutex); if ((d->state & Canceled) || (d->state & Finished)) @@ -390,7 +390,7 @@ QMutex *QFutureInterfaceBase::mutex() const return &d->m_mutex; } -QtConcurrent::internal::ExceptionStore &QFutureInterfaceBase::exceptionStore() +QtPrivate::ExceptionStore &QFutureInterfaceBase::exceptionStore() { return d->m_exceptionStore; } |