3 files changed, 51 insertions, 3 deletions
diff --git a/tests/auto/widgets/kernel/qformlayout/BLACKLIST b/tests/auto/widgets/kernel/qformlayout/BLACKLIST
deleted file mode 100644
index e69de29bb2..0000000000
--- a/tests/auto/widgets/kernel/qformlayout/BLACKLIST
+++ /dev/null
diff --git a/tests/auto/widgets/kernel/qformlayout/CMakeLists.txt b/tests/auto/widgets/kernel/qformlayout/CMakeLists.txt
index 38a6580cb0..9e1da4c6a3 100644
--- a/tests/auto/widgets/kernel/qformlayout/CMakeLists.txt
+++ b/tests/auto/widgets/kernel/qformlayout/CMakeLists.txt
@@ -1,12 +1,16 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: BSD-3-Clause
 
-# Generated from qformlayout.pro.
-
 #####################################################################
 ## tst_qformlayout Test:
 #####################################################################
 
+if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+    cmake_minimum_required(VERSION 3.16)
+    project(tst_qformlayout LANGUAGES CXX)
+    find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST)
+endif()
+
 qt_internal_add_test(tst_qformlayout
     SOURCES
         tst_qformlayout.cpp
diff --git a/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp b/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp
index 33e6bd64db..9638823538 100644
--- a/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp
+++ b/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp
@@ -1,5 +1,5 @@
 // Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 
 #include <QTest>
@@ -112,6 +112,7 @@ private slots:
     void setLayout();
     void hideShowRow();
     void showWithHiddenRow();
+    void hiddenRowAndStretch();
 
 /*
     QLayoutItem *itemAt(int row, ItemRole role) const;
@@ -1253,6 +1254,49 @@ void tst_QFormLayout::showWithHiddenRow()
     topLevel.show();
 }
 
+/*
+    Test that hiding rows does not leave outdated layout data behind
+    in hidden items that results in out-of-bounds array access. See
+    QTBUG-109237.
+*/
+void tst_QFormLayout::hiddenRowAndStretch()
+{
+    QWidget topLevel;
+    QFormLayout layout;
+    layout.setRowWrapPolicy(QFormLayout::WrapAllRows);
+
+    // We need our own stretcher item so that QFormLayout doesn't insert
+    // it's own, as that would grow the size of the layout data array again.
+    QSpacerItem *stretch = new QSpacerItem(100, 100, QSizePolicy::Expanding, QSizePolicy::Expanding);
+    layout.setItem(0, QFormLayout::FieldRole, stretch);
+
+    QLabel *lastLabel = nullptr;
+    QLineEdit *lastField = nullptr;
+    for (int row = 1; row < 4; ++row) {
+        QLabel *label = new QLabel(QString("Label %1").arg(row));
+        label->setWordWrap(true);
+        QLineEdit *field = new QLineEdit;
+        layout.setWidget(row, QFormLayout::LabelRole, label);
+        layout.setWidget(row, QFormLayout::FieldRole, field);
+        if (row == 3) {
+            lastLabel = label;
+            lastField = field;
+        }
+    }
+
+    Q_ASSERT(lastLabel);
+    Q_ASSERT(lastField);
+
+    topLevel.setLayout(&layout);
+    topLevel.sizeHint();
+
+    lastLabel->setVisible(false);
+    lastField->setVisible(false);
+
+    // should not assert here
+    topLevel.show();
+}
+
 void tst_QFormLayout::itemAt()
 {
     QWidget topLevel;