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, 7 insertions, 7 deletions

diff --git a/tests/auto/concurrent/qtconcurrentthreadengine/tst_qtconcurrentthreadengine.cpp b/tests/auto/concurrent/qtconcurrentthreadengine/tst_qtconcurrentthreadengine.cpp
index d2e4c74be8..edf9104571 100644
--- a/tests/auto/concurrent/qtconcurrentthreadengine/tst_qtconcurrentthreadengine.cpp
+++ b/tests/auto/concurrent/qtconcurrentthreadengine/tst_qtconcurrentthreadengine.cpp
@@ -425,7 +425,7 @@ public:
     ThreadFunctionResult threadFunction()
     {
         QTest::qSleep(50);
-        throw QtConcurrent::Exception();
+        throw QException();
         return ThreadFinished;
     }
     QThread *blockThread;
@@ -457,7 +457,7 @@ void tst_QtConcurrentThreadEngine::exceptions()
             QtConcurrentExceptionThrower *e = new QtConcurrentExceptionThrower();
             QFuture<void> f = e->startAsynchronously();
             f.waitForFinished();
-        } catch (const Exception &) {
+        } catch (const QException &) {
             caught = true;
         }
         QVERIFY2(caught, "did not get exception");
@@ -470,7 +470,7 @@ void tst_QtConcurrentThreadEngine::exceptions()
         try  {
             QtConcurrentExceptionThrower e(QThread::currentThread());
             e.startBlocking();
-        } catch (const Exception &) {
+        } catch (const QException &) {
             caught = true;
         }
         QVERIFY2(caught, "did not get exception");
@@ -482,7 +482,7 @@ void tst_QtConcurrentThreadEngine::exceptions()
         try  {
             QtConcurrentExceptionThrower e(0);
             e.startBlocking();
-        } catch (const Exception &) {
+        } catch (const QException &) {
             caught = true;
         }
         QVERIFY2(caught, "did not get exception");
@@ -495,7 +495,7 @@ void tst_QtConcurrentThreadEngine::exceptions()
             UnrelatedExceptionThrower *e = new UnrelatedExceptionThrower();
             QFuture<void> f = e->startAsynchronously();
             f.waitForFinished();
-        } catch (const QtConcurrent::UnhandledException &) {
+        } catch (const QUnhandledException &) {
             caught = true;
         }
         QVERIFY2(caught, "did not get exception");
@@ -508,7 +508,7 @@ void tst_QtConcurrentThreadEngine::exceptions()
         try  {
             UnrelatedExceptionThrower e(QThread::currentThread());
             e.startBlocking();
-        } catch (const QtConcurrent::UnhandledException &) {
+        } catch (const QUnhandledException &) {
             caught = true;
         }
         QVERIFY2(caught, "did not get exception");
@@ -520,7 +520,7 @@ void tst_QtConcurrentThreadEngine::exceptions()
         try  {
             UnrelatedExceptionThrower e(0);
             e.startBlocking();
-        } catch (const QtConcurrent::UnhandledException &) {
+        } catch (const QUnhandledException &) {
             caught = true;
         }
         QVERIFY2(caught, "did not get exception");