summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2015-05-04 16:54:54 +0200
committerAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2015-05-05 07:06:43 +0000
commit4c8bbf8dda02a2e1f40d8b13911dbf055fbb5fcc (patch)
treecbf83f08b61f2d3c71b68ac969d1c21460ea60e5
parent12970e03123521192fa468548bf9235deabead79 (diff)
Revert change of NOTHROW to NOEXCEPT
The change would remove the noexception hint on MSVC versions that doesn't support noexcept but supports their older 'throw()' hint. Change-Id: Ie5163f2413522f427279f59c8562c0ce4769bc82 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
-rw-r--r--src/gui/kernel/qpalette.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qpalette.h b/src/gui/kernel/qpalette.h
index 78dd2ce9d7..66b3f039f4 100644
--- a/src/gui/kernel/qpalette.h
+++ b/src/gui/kernel/qpalette.h
@@ -61,7 +61,7 @@ public:
~QPalette();
QPalette &operator=(const QPalette &palette);
#ifdef Q_COMPILER_RVALUE_REFS
- QPalette(QPalette &&other) Q_DECL_NOEXCEPT
+ QPalette(QPalette &&other) Q_DECL_NOTHROW
: d(other.d), data(other.data)
{ other.d = Q_NULLPTR; }
inline QPalette &operator=(QPalette &&other) Q_DECL_NOEXCEPT