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

Change-Id: I176c40d031be26a1dd1cf08843e448a660598783

1 files changed, 4 insertions, 4 deletions

diff --git a/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp b/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp
index cff3dad35e..ab32643061 100644
--- a/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp
+++ b/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp
@@ -52,7 +52,7 @@ using namespace QTestPrivate;
 Q_CONSTEXPR QFormLayout::ItemRole invalidRole = QFormLayout::ItemRole(3);
 
 struct QFormLayoutTakeRowResultHolder {
-    QFormLayoutTakeRowResultHolder(QFormLayout::TakeRowResult result) Q_DECL_NOTHROW
+    QFormLayoutTakeRowResultHolder(QFormLayout::TakeRowResult result) noexcept
         : labelItem(result.labelItem),
           fieldItem(result.fieldItem)
     {
@@ -66,20 +66,20 @@ struct QFormLayoutTakeRowResultHolder {
         if (fieldItem)
             disposer.setItem(0, QFormLayout::FieldRole, fieldItem);
     }
-    QFormLayoutTakeRowResultHolder(QFormLayoutTakeRowResultHolder &&other) Q_DECL_NOTHROW
+    QFormLayoutTakeRowResultHolder(QFormLayoutTakeRowResultHolder &&other) noexcept
         : labelItem(other.labelItem),
           fieldItem(other.fieldItem)
     {
         other.labelItem = nullptr;
         other.fieldItem = nullptr;
     }
-    QFormLayoutTakeRowResultHolder &operator=(QFormLayoutTakeRowResultHolder &&other) Q_DECL_NOTHROW
+    QFormLayoutTakeRowResultHolder &operator=(QFormLayoutTakeRowResultHolder &&other) noexcept
     {
         swap(other);
         return *this;
     }
 
-    void swap(QFormLayoutTakeRowResultHolder &other) Q_DECL_NOTHROW
+    void swap(QFormLayoutTakeRowResultHolder &other) noexcept
     {
         qSwap(labelItem, other.labelItem);
         qSwap(fieldItem, other.fieldItem);