summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/corelib/thread/qexception.cpp8
-rw-r--r--src/corelib/thread/qexception.h10
2 files changed, 13 insertions, 5 deletions
diff --git a/src/corelib/thread/qexception.cpp b/src/corelib/thread/qexception.cpp
index 01bbe70c88..04a03b8623 100644
--- a/src/corelib/thread/qexception.cpp
+++ b/src/corelib/thread/qexception.cpp
@@ -108,7 +108,9 @@ QT_BEGIN_NAMESPACE
*/
QException::~QException()
-#ifndef Q_COMPILER_NOEXCEPT
+#ifdef Q_COMPILER_NOEXCEPT
+ noexcept
+#else
throw()
#endif
{
@@ -127,7 +129,9 @@ QException *QException::clone() const
}
QUnhandledException::~QUnhandledException()
-#ifndef Q_COMPILER_NOEXCEPT
+#ifdef Q_COMPILER_NOEXCEPT
+ noexcept
+#else
throw()
#endif
{
diff --git a/src/corelib/thread/qexception.h b/src/corelib/thread/qexception.h
index edf361ebd3..7fb798fdad 100644
--- a/src/corelib/thread/qexception.h
+++ b/src/corelib/thread/qexception.h
@@ -54,7 +54,9 @@ class Q_CORE_EXPORT QException : public std::exception
{
public:
~QException()
-#ifndef Q_COMPILER_NOEXCEPT
+#ifdef Q_COMPILER_NOEXCEPT
+ noexcept
+#else
throw()
#endif
;
@@ -66,10 +68,12 @@ class Q_CORE_EXPORT QUnhandledException : public QException
{
public:
~QUnhandledException()
-#ifndef Q_COMPILER_NOEXCEPT
+#ifdef Q_COMPILER_NOEXCEPT
+ noexcept
+#else
throw()
#endif
-;
+ ;
void raise() const Q_DECL_OVERRIDE;
QUnhandledException *clone() const Q_DECL_OVERRIDE;
};