diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2012-10-21 20:10:22 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-02 00:23:14 +0100 |
| commit | 716d33d2a73ade42eb31be3e8ecbaeecdd5ddd21 (patch) | |
| tree | f5e97e43c917bf64ec456aa86d32a4e91edbe3b3 /tests/auto/widgets/kernel/qboxlayout | |
| parent | 1211b956de5ef63cfe65e9cb0c49a42d52c0a3d9 (diff) | |
[QTBUG-27420] Make Q{Box,Grid,Form}Layout::takeAt() unparent a nested layout
QStackedLayout doesn't have support for QLayout, only QWidget, so
the issue doesn't arise there.
Reported-by: Johannes Schaub
Task-number: QTBUG-27420
Change-Id: I71f8d10a036918c16d8f8c9197a2ec61cd76cf01
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'tests/auto/widgets/kernel/qboxlayout')
| -rw-r--r-- | tests/auto/widgets/kernel/qboxlayout/tst_qboxlayout.cpp | 22 |
1 files changed, 22 insertions, 0 deletions
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" |