diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-06-03 10:44:49 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-06-03 12:31:35 +0000 |
| commit | dc2617f35be61b4827b8e3d192c85e2feacf7f6a (patch) | |
| tree | fafd343854dc43865a84a392c7a6b8657da00302 | |
| parent | a21dfab54ed518266c42d3e87e02bd991de8486e (diff) | |
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 <marc.mutz@kdab.com>
| -rw-r--r-- | src/corelib/thread/qexception.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/corelib/thread/qexception.cpp b/src/corelib/thread/qexception.cpp index 550bdc8fe4..01bbe70c88 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 } |