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 /src/widgets/kernel/qformlayout.cpp | |
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 'src/widgets/kernel/qformlayout.cpp')
-rw-r--r-- | src/widgets/kernel/qformlayout.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
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; } |