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/qtconcurrentthreadengine.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/qtconcurrentthreadengine.h')
| -rw-r--r-- | src/concurrent/qtconcurrentthreadengine.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/concurrent/qtconcurrentthreadengine.h b/src/concurrent/qtconcurrentthreadengine.h index 971348be97..2a5187502f 100644 --- a/src/concurrent/qtconcurrentthreadengine.h +++ b/src/concurrent/qtconcurrentthreadengine.h @@ -49,7 +49,7 @@ #include <QtCore/qthreadpool.h> #include <QtConcurrent/qfuture.h> #include <QtCore/qdebug.h> -#include <QtConcurrent/qtconcurrentexception.h> +#include <QtCore/qexception.h> #include <QtCore/qwaitcondition.h> #include <QtCore/qatomic.h> #include <QtCore/qsemaphore.h> @@ -119,13 +119,13 @@ private: void run(); virtual void asynchronousFinish() = 0; #ifndef QT_NO_EXCEPTIONS - void handleException(const QtConcurrent::Exception &exception); + void handleException(const QException &exception); #endif protected: QFutureInterfaceBase *futureInterface; QThreadPool *threadPool; ThreadEngineBarrier barrier; - QtConcurrent::internal::ExceptionStore exceptionStore; + QtPrivate::ExceptionStore exceptionStore; }; |