From 3a29976eac1ff95e663d49886dc82611a175fed9 Mon Sep 17 00:00:00 2001 From: Marc Mutz 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 --- tests/auto/concurrent/qtconcurrentrun/tst_qtconcurrentrun.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tests/auto/concurrent/qtconcurrentrun') diff --git a/tests/auto/concurrent/qtconcurrentrun/tst_qtconcurrentrun.cpp b/tests/auto/concurrent/qtconcurrentrun/tst_qtconcurrentrun.cpp index af63c25240..f3f4be3f3f 100644 --- a/tests/auto/concurrent/qtconcurrentrun/tst_qtconcurrentrun.cpp +++ b/tests/auto/concurrent/qtconcurrentrun/tst_qtconcurrentrun.cpp @@ -367,12 +367,12 @@ int fn2(double, int *) #ifndef QT_NO_EXCEPTIONS void throwFunction() { - throw QtConcurrent::Exception(); + throw QException(); } int throwFunctionReturn() { - throw QtConcurrent::Exception(); + throw QException(); return 0; } @@ -381,7 +381,7 @@ void tst_QtConcurrentRun::exceptions() bool caught = false; try { QtConcurrent::run(throwFunction).waitForFinished(); - } catch (Exception &) { + } catch (QException &) { caught = true; } if (!caught) @@ -390,7 +390,7 @@ void tst_QtConcurrentRun::exceptions() caught = false; try { QtConcurrent::run(throwFunctionReturn).waitForFinished(); - } catch (Exception &) { + } catch (QException &) { caught = true; } if (!caught) -- cgit v1.2.3