summaryrefslogtreecommitdiffstats
path: root/src/corelib/concurrent/qtconcurrentexception.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/corelib/concurrent/qtconcurrentexception.cpp')
-rw-r--r--src/corelib/concurrent/qtconcurrentexception.cpp7
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();
}