diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/kernel/qboxlayout.cpp | 6 | ||||
| -rw-r--r-- | src/gui/kernel/qformlayout.cpp | 7 | ||||
| -rw-r--r-- | src/gui/kernel/qgridlayout.cpp | 15 |
3 files changed, 23 insertions, 5 deletions
diff --git a/src/gui/kernel/qboxlayout.cpp b/src/gui/kernel/qboxlayout.cpp index 5dde1d294b..cca524d6b4 100644 --- a/src/gui/kernel/qboxlayout.cpp +++ b/src/gui/kernel/qboxlayout.cpp @@ -788,6 +788,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/gui/kernel/qformlayout.cpp b/src/gui/kernel/qformlayout.cpp index 0cbb9fa1a6..9e481ec849 100644 --- a/src/gui/kernel/qformlayout.cpp +++ b/src/gui/kernel/qformlayout.cpp @@ -1410,6 +1410,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/gui/kernel/qgridlayout.cpp b/src/gui/kernel/qgridlayout.cpp index cb0dc908fb..3f11faa9b4 100644 --- a/src/gui/kernel/qgridlayout.cpp +++ b/src/gui/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) { |