summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/widgets/kernel/qboxlayout.cpp6
-rw-r--r--src/widgets/kernel/qformlayout.cpp7
-rw-r--r--src/widgets/kernel/qgridlayout.cpp15
-rw-r--r--tests/auto/widgets/kernel/qboxlayout/tst_qboxlayout.cpp22
-rw-r--r--tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp24
-rw-r--r--tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp24
6 files changed, 93 insertions, 5 deletions
diff --git a/src/widgets/kernel/qboxlayout.cpp b/src/widgets/kernel/qboxlayout.cpp
index d16c999508..62c4e526c7 100644
--- a/src/widgets/kernel/qboxlayout.cpp
+++ b/src/widgets/kernel/qboxlayout.cpp
@@ -729,6 +729,12 @@ QLayoutItem *QBoxLayout::takeAt(int index)
b->item = 0;
delete b;
+ if (QLayout *l = item->layout()) {
+ // sanity check in case the user passed something weird to QObject::setParent()
+ if (l->parent() == this)
+ l->setParent(0);
+ }
+
invalidate();
return item;
}
diff --git a/src/widgets/kernel/qformlayout.cpp b/src/widgets/kernel/qformlayout.cpp
index b726ff83f8..f875de16df 100644
--- a/src/widgets/kernel/qformlayout.cpp
+++ b/src/widgets/kernel/qformlayout.cpp
@@ -1409,6 +1409,13 @@ QLayoutItem *QFormLayout::takeAt(int index)
QLayoutItem *i = item->item;
item->item = 0;
delete item;
+
+ if (QLayout *l = i->layout()) {
+ // sanity check in case the user passed something weird to QObject::setParent()
+ if (l->parent() == this)
+ l->setParent(0);
+ }
+
return i;
}
diff --git a/src/widgets/kernel/qgridlayout.cpp b/src/widgets/kernel/qgridlayout.cpp
index b5cd746c03..eda9b9def6 100644
--- a/src/widgets/kernel/qgridlayout.cpp
+++ b/src/widgets/kernel/qgridlayout.cpp
@@ -156,15 +156,20 @@ public:
return 0;
}
inline QLayoutItem *takeAt(int index) {
- QLayoutItem *item = 0;
+ Q_Q(QGridLayout);
if (index < things.count()) {
- QGridBox *b = things.takeAt(index);
- if (b) {
- item = b->takeItem();
+ if (QGridBox *b = things.takeAt(index)) {
+ QLayoutItem *item = b->takeItem();
+ if (QLayout *l = item->layout()) {
+ // sanity check in case the user passed something weird to QObject::setParent()
+ if (l->parent() == q)
+ l->setParent(0);
+ }
delete b;
+ return item;
}
}
- return item;
+ return 0;
}
void getItemPosition(int index, int *row, int *column, int *rowSpan, int *columnSpan) const {
diff --git a/tests/auto/widgets/kernel/qboxlayout/tst_qboxlayout.cpp b/tests/auto/widgets/kernel/qboxlayout/tst_qboxlayout.cpp
index 3564800a8b..4f1615a48e 100644
--- a/tests/auto/widgets/kernel/qboxlayout/tst_qboxlayout.cpp
+++ b/tests/auto/widgets/kernel/qboxlayout/tst_qboxlayout.cpp
@@ -66,6 +66,7 @@ private slots:
void setStyleShouldChangeSpacing();
void taskQTBUG_7103_minMaxWidthNotRespected();
+ void taskQTBUG_27420_takeAtShouldUnparentLayout();
};
class CustomLayoutStyle : public QProxyStyle
@@ -273,5 +274,26 @@ void tst_QBoxLayout::taskQTBUG_7103_minMaxWidthNotRespected()
QCOMPARE(label->height(), height);
}
+void tst_QBoxLayout::taskQTBUG_27420_takeAtShouldUnparentLayout()
+{
+ QSharedPointer<QHBoxLayout> outer(new QHBoxLayout);
+ QPointer<QVBoxLayout> inner = new QVBoxLayout;
+
+ outer->addLayout(inner);
+ QCOMPARE(outer->count(), 1);
+ QCOMPARE(inner->parent(), outer.data());
+
+ QLayoutItem *item = outer->takeAt(0);
+ QCOMPARE(item->layout(), inner.data());
+ 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());
+}
+
QTEST_MAIN(tst_QBoxLayout)
#include "tst_qboxlayout.moc"
diff --git a/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp b/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp
index 3aa0ea03f4..b2cdb87221 100644
--- a/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp
+++ b/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp
@@ -51,6 +51,7 @@
#include <QtWidgets/QLineEdit>
#include <QtWidgets/QPushButton>
#include <QStyleFactory>
+#include <QSharedPointer>
#include <qformlayout.h>
@@ -123,6 +124,8 @@ private slots:
Qt::Orientations expandingDirections() const;
*/
+ void taskQTBUG_27420_takeAtShouldUnparentLayout();
+
};
tst_QFormLayout::tst_QFormLayout()
@@ -901,6 +904,27 @@ void tst_QFormLayout::layoutAlone()
QTest::qWait(500);
}
+void tst_QFormLayout::taskQTBUG_27420_takeAtShouldUnparentLayout()
+{
+ QSharedPointer<QFormLayout> outer(new QFormLayout);
+ QPointer<QFormLayout> inner = new QFormLayout;
+
+ outer->addRow(inner);
+ QCOMPARE(outer->count(), 1);
+ QCOMPARE(inner->parent(), outer.data());
+
+ QLayoutItem *item = outer->takeAt(0);
+ QCOMPARE(item->layout(), inner.data());
+ 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());
+}
+
QTEST_MAIN(tst_QFormLayout)
#include "tst_qformlayout.moc"
diff --git a/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp b/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp
index 34b38c1e53..e52ff3fa8b 100644
--- a/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp
+++ b/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp
@@ -52,6 +52,7 @@
#include <QtWidgets/QLineEdit>
#include <QtWidgets/QRadioButton>
#include <QStyleFactory>
+#include <QSharedPointer>
class tst_QGridLayout : public QObject
{
@@ -89,6 +90,8 @@ private slots:
void contentsRect();
void distributeMultiCell();
+ void taskQTBUG_27420_takeAtShouldUnparentLayout();
+
private:
QWidget *testWidget;
QGridLayout *testLayout;
@@ -1605,5 +1608,26 @@ void tst_QGridLayout::distributeMultiCell()
QCOMPARE(w.sizeHint().height(), 11 + 57 + 11);
}
+void tst_QGridLayout::taskQTBUG_27420_takeAtShouldUnparentLayout()
+{
+ QSharedPointer<QGridLayout> outer(new QGridLayout);
+ QPointer<QGridLayout> inner = new QGridLayout;
+
+ outer->addLayout(inner, 0, 0);
+ QCOMPARE(outer->count(), 1);
+ QCOMPARE(inner->parent(), outer.data());
+
+ QLayoutItem *item = outer->takeAt(0);
+ QCOMPARE(item->layout(), inner.data());
+ 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());
+}
+
QTEST_MAIN(tst_QGridLayout)
#include "tst_qgridlayout.moc"
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-19 20:59:24 +0000