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>

1 files changed, 5 insertions, 5 deletions

diff --git a/src/concurrent/qtconcurrentthreadengine.cpp b/src/concurrent/qtconcurrentthreadengine.cpp
index 886fb09ea6..56592965fd 100644
--- a/src/concurrent/qtconcurrentthreadengine.cpp
+++ b/src/concurrent/qtconcurrentthreadengine.cpp
@@ -155,10 +155,10 @@ void ThreadEngineBase::startBlocking()
             }
         }
 #ifndef QT_NO_EXCEPTIONS
-    } catch (QtConcurrent::Exception &e) {
+    } catch (QException &e) {
         handleException(e);
     } catch (...) {
-        handleException(QtConcurrent::UnhandledException());
+        handleException(QUnhandledException());
     }
 #endif
 
@@ -271,10 +271,10 @@ void ThreadEngineBase::run() // implements QRunnable.
         }
 
 #ifndef QT_NO_EXCEPTIONS
-    } catch (QtConcurrent::Exception &e) {
+    } catch (QException &e) {
         handleException(e);
     } catch (...) {
-        handleException(QtConcurrent::UnhandledException());
+        handleException(QUnhandledException());
     }
 #endif
     threadExit();
@@ -282,7 +282,7 @@ void ThreadEngineBase::run() // implements QRunnable.
 
 #ifndef QT_NO_EXCEPTIONS
 
-void ThreadEngineBase::handleException(const QtConcurrent::Exception &exception)
+void ThreadEngineBase::handleException(const QException &exception)
 {
     if (futureInterface)
         futureInterface->reportException(exception);