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/qfutureinterface.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/src/concurrent/qfutureinterface.h b/src/concurrent/qfutureinterface.h
index 55112ab68d..615b9fbe6a 100644
--- a/src/concurrent/qfutureinterface.h
+++ b/src/concurrent/qfutureinterface.h
@@ -49,7 +49,7 @@
 #ifndef QT_NO_QFUTURE
 
 #include <QtCore/qmutex.h>
-#include <QtConcurrent/qtconcurrentexception.h>
+#include <QtCore/qexception.h>
 #include <QtConcurrent/qtconcurrentresultstore.h>
 
 QT_BEGIN_HEADER
@@ -83,7 +83,7 @@ public:
     void reportFinished();
     void reportCanceled();
 #ifndef QT_NO_EXCEPTIONS
-    void reportException(const QtConcurrent::Exception &e);
+    void reportException(const QException &e);
 #endif
     void reportResultsReady(int beginIndex, int endIndex);
 
@@ -122,7 +122,7 @@ public:
     void waitForResume();
 
     QMutex *mutex() const;
-    QtConcurrent::internal::ExceptionStore &exceptionStore();
+    QtPrivate::ExceptionStore &exceptionStore();
     QtConcurrent::ResultStoreBase &resultStoreBase();
     const QtConcurrent::ResultStoreBase &resultStoreBase() const;
 
-- 
cgit v1.2.3