From dc2617f35be61b4827b8e3d192c85e2feacf7f6a Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 3 Jun 2015 10:44:49 +0200 Subject: Fix build on QNX 650 Commit 2fa7b3b317fa941064ec4ba62163e3244becf55a broke the build, the compiler (gcc 4.4) doesn't like the mismatch between constructor declaration and definition. Change-Id: Ied1f3293c21871276ce8d2db3d2e6c06c75ade90 Reviewed-by: Marc Mutz --- src/corelib/thread/qexception.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/corelib/thread/qexception.cpp') diff --git a/src/corelib/thread/qexception.cpp b/src/corelib/thread/qexception.cpp index 550bdc8fe44..01bbe70c88a 100644 --- a/src/corelib/thread/qexception.cpp +++ b/src/corelib/thread/qexception.cpp @@ -108,6 +108,9 @@ QT_BEGIN_NAMESPACE */ QException::~QException() +#ifndef Q_COMPILER_NOEXCEPT + throw() +#endif { // must stay empty until ### Qt 6 } @@ -124,6 +127,9 @@ QException *QException::clone() const } QUnhandledException::~QUnhandledException() +#ifndef Q_COMPILER_NOEXCEPT + throw() +#endif { // must stay empty until ### Qt 6 } -- cgit v1.2.3