diff options
| author | aavit <qt-info@nokia.com> | 2011-04-26 08:28:04 (GMT) |
|---|---|---|
| committer | aavit <qt-info@nokia.com> | 2011-04-26 08:28:04 (GMT) |
| commit | ff8c99eb54f33108709f9f3107b35780a80f3f17 (patch) | |
| tree | 11d4c08809bf90fd8b25b175b4903ab00d36e3d6 /src/corelib/concurrent/qtconcurrentexception.cpp | |
| parent | 28c7e17d9eeb8264ad9e26a5b93e5ff744add9a6 (diff) | |
| parent | 7ef9f99301a7c71fdb835f9e1f27d3111557aa2e (diff) | |
| download | Qt-ff8c99eb54f33108709f9f3107b35780a80f3f17.zip Qt-ff8c99eb54f33108709f9f3107b35780a80f3f17.tar.gz Qt-ff8c99eb54f33108709f9f3107b35780a80f3f17.tar.bz2 | |
Merge remote branch 'qt-mainline/master'
Conflicts:
configure
Diffstat (limited to 'src/corelib/concurrent/qtconcurrentexception.cpp')
| -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 948269a..b4123f5 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(); } |