diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-03-25 18:24:35 (GMT) |
|---|---|---|
| committer | Qt Commercial Integration <QtCommercial@digia.com> | 2012-01-31 10:24:41 (GMT) |
| commit | 3038b29a9bfe2ee9fc1b72fa2c0dc0a6bece753b (patch) | |
| tree | fc027d343695e8a2d896479220241ece9a288c9d /src | |
| parent | cbce03887f8e4025fc65abb49e263bcbad8e3573 (diff) | |
| download | Qt-3038b29a9bfe2ee9fc1b72fa2c0dc0a6bece753b.zip Qt-3038b29a9bfe2ee9fc1b72fa2c0dc0a6bece753b.tar.gz Qt-3038b29a9bfe2ee9fc1b72fa2c0dc0a6bece753b.tar.bz2 | |
QtConcurrent: throw exception from destructor
Task-number: QTBUG-18149
Reviewed-by: Morten Sorvig
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/concurrent/qtconcurrentexception.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/corelib/concurrent/qtconcurrentexception.cpp b/src/corelib/concurrent/qtconcurrentexception.cpp index 55a9b33..933ad3c 100644 --- a/src/corelib/concurrent/qtconcurrentexception.cpp +++ b/src/corelib/concurrent/qtconcurrentexception.cpp @@ -203,12 +203,7 @@ ExceptionHolder ExceptionStore::exception() void ExceptionStore::throwPossibleException() { - /* On win32-g++, with GCC 3.4.2 std::uncaught_exception() isn't reliable. */ - if (hasException() -#ifndef Q_CC_MINGW - && std::uncaught_exception() == false -#endif - ) { + if (hasException() ) { exceptionHolder.base->hasThrown = true; exceptionHolder.exception()->raise(); } |