diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2016-05-10 19:56:51 +0100 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2016-05-10 19:08:04 +0000 |
commit | ccb460bf3d6ea393bc114bc571c12875a37465f2 (patch) | |
tree | 2612b6bc2ae3ee0600b032054ac355dcd1b2aef1 /src/core/qt3dcore_global.h | |
parent | 10c9269ce4a73c416ada825406328b1fba9136d4 (diff) |
Fix compilation on MSVC2013
A CI misconfiguration allowed a small mistake in a macro to slip
through that actually broke compilation on MSVC 2013.
Task-number: QTBUG-53250
Change-Id: I19dd04b0fb059dcb1e2483ec70c6f2c3ed96aa59
Reviewed-by: Volker Krause <volker.krause@kdab.com>
Diffstat (limited to 'src/core/qt3dcore_global.h')
-rw-r--r-- | src/core/qt3dcore_global.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/qt3dcore_global.h b/src/core/qt3dcore_global.h index 3eb5a667f..725df149b 100644 --- a/src/core/qt3dcore_global.h +++ b/src/core/qt3dcore_global.h @@ -68,7 +68,7 @@ QT_BEGIN_NAMESPACE #define QT3D_DECLARE_SHARED(NS, Class) \ inline void swap(Class &lhs, Class &rhs) \ - Q_DECL_NOEXCEPT(noexcept(lhs.swap(rhs))) \ + Q_DECL_NOEXCEPT_EXPR(noexcept(lhs.swap(rhs))) \ { lhs.swap(rhs); } \ QT3D_DECLARE_TYPEINFO(NS, Class, Q_MOVABLE_TYPE) \ /*end*/ |