1 files changed, 11 insertions, 10 deletions
diff --git a/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp b/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp
index cff3dad35e..c6760000f4 100644
--- a/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp
+++ b/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp
@@ -38,6 +38,9 @@
 #include <QtWidgets/QLabel>
 #include <QtWidgets/QLineEdit>
 #include <QtWidgets/QPushButton>
+
+#include <private/qdialog_p.h>
+
 #include <QStyleFactory>
 #include <QSharedPointer>
 
@@ -52,7 +55,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 +69,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);
@@ -1196,22 +1199,20 @@ void tst_QFormLayout::layoutAlone()
 void tst_QFormLayout::taskQTBUG_27420_takeAtShouldUnparentLayout()
 {
     QSharedPointer<QFormLayout> outer(new QFormLayout);
-    QPointer<QFormLayout> inner = new QFormLayout;
+    QAutoPointer<QFormLayout> holder{new QFormLayout};
+    auto inner = holder.get();
 
     outer->addRow(inner);
     QCOMPARE(outer->count(), 1);
     QCOMPARE(inner->parent(), outer.data());
 
     QLayoutItem *item = outer->takeAt(0);
-    QCOMPARE(item->layout(), inner.data());
+    QCOMPARE(item->layout(), inner);
     QVERIFY(!item->layout()->parent());
 
     outer.reset();
 
-    if (inner)
-        delete item; // success: a taken item/layout should not be deleted when the old parent is deleted
-    else
-        QVERIFY(!inner.isNull());
+    QVERIFY(holder); // a taken item/layout should not be deleted when the old parent is deleted
 }
 
 void tst_QFormLayout::taskQTBUG_40609_addingWidgetToItsOwnLayout(){