Merge commit 'dev' into 'wip/cmake-merge'

Change-Id: I176c40d031be26a1dd1cf08843e448a660598783

1 files changed, 3 insertions, 3 deletions

diff --git a/src/dbus/qdbuserror.h b/src/dbus/qdbuserror.h
index c264f62b7d..5a68a417c4 100644
--- a/src/dbus/qdbuserror.h
+++ b/src/dbus/qdbuserror.h
@@ -99,17 +99,17 @@ public:
     QDBusError(ErrorType error, const QString &message);
     QDBusError(const QDBusError &other);
 #ifdef Q_COMPILER_RVALUE_REFS
-    QDBusError(QDBusError &&other) Q_DECL_NOTHROW
+    QDBusError(QDBusError &&other) noexcept
         : code(other.code), msg(std::move(other.msg)), nm(std::move(other.nm))
     {}
-    QDBusError &operator=(QDBusError &&other) Q_DECL_NOTHROW { swap(other); return *this; }
+    QDBusError &operator=(QDBusError &&other) noexcept { swap(other); return *this; }
 #endif
     QDBusError &operator=(const QDBusError &other);
 #ifndef QT_BOOTSTRAPPED
     QDBusError &operator=(const QDBusMessage &msg);
 #endif
 
-    void swap(QDBusError &other) Q_DECL_NOTHROW
+    void swap(QDBusError &other) noexcept
     {
         qSwap(code,   other.code);
         qSwap(msg,    other.msg);