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

Change-Id: I176c40d031be26a1dd1cf08843e448a660598783

1 files changed, 2 insertions, 2 deletions

diff --git a/src/gui/painting/qpagelayout.h b/src/gui/painting/qpagelayout.h
index b41689d33b..faf0827c1a 100644
--- a/src/gui/painting/qpagelayout.h
+++ b/src/gui/painting/qpagelayout.h
@@ -83,12 +83,12 @@ public:
                 const QMarginsF &minMargins = QMarginsF(0, 0, 0, 0));
     QPageLayout(const QPageLayout &other);
 #ifdef Q_COMPILER_RVALUE_REFS
-    QPageLayout &operator=(QPageLayout &&other) Q_DECL_NOTHROW { swap(other); return *this; }
+    QPageLayout &operator=(QPageLayout &&other) noexcept { swap(other); return *this; }
 #endif
     QPageLayout &operator=(const QPageLayout &other);
     ~QPageLayout();
 
-    void swap(QPageLayout &other) Q_DECL_NOTHROW { qSwap(d, other.d); }
+    void swap(QPageLayout &other) noexcept { qSwap(d, other.d); }
 
     friend Q_GUI_EXPORT bool operator==(const QPageLayout &lhs, const QPageLayout &rhs);
     bool isEquivalentTo(const QPageLayout &other) const;