From 3a29976eac1ff95e663d49886dc82611a175fed9 Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@kdab.com>
Date: Mon, 27 Aug 2012 12:24:48 +0200
Subject: 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>
---
 src/concurrent/qtconcurrentthreadengine.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/concurrent/qtconcurrentthreadengine.h')

diff --git a/src/concurrent/qtconcurrentthreadengine.h b/src/concurrent/qtconcurrentthreadengine.h
index 971348be973..2a5187502f1 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;
 };
 
 
-- 
cgit v1.2.3