diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2012-08-27 12:24:48 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-09-28 23:50:10 +0200 |
| commit | 3a29976eac1ff95e663d49886dc82611a175fed9 (patch) | |
| tree | 31d70d25501a0f95e17b65e4c029c5c40b75610f /tests/auto/concurrent/qtconcurrentmap | |
| parent | 5414a9a03bec65fd180f3c29811397df14130881 (diff) | |
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>
Diffstat (limited to 'tests/auto/concurrent/qtconcurrentmap')
| -rw-r--r-- | tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp b/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp index 48837d3ee0..186ee826cf 100644 --- a/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp +++ b/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp @@ -2205,7 +2205,7 @@ void tst_QtConcurrentMap::throttling() void throwMapper(int &e) { Q_UNUSED(e); - throw QtConcurrent::Exception(); + throw QException(); } void tst_QtConcurrentMap::exceptions() @@ -2214,7 +2214,7 @@ void tst_QtConcurrentMap::exceptions() try { QList<int> list = QList<int>() << 1 << 2 << 3; QtConcurrent::map(list, throwMapper).waitForFinished(); - } catch (const Exception &) { + } catch (const QException &) { caught = true; } if (!caught) |