summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJan-Arve Sæther <jan-arve.saether@nokia.com>2009-10-19 07:39:30 (GMT)
committerJan-Arve Sæther <jan-arve.saether@nokia.com>2009-10-19 07:39:30 (GMT)
commit856efef9bf87e0b7e5ed6ad2ccb225e294321888 (patch)
tree452563793f599fd457b2558e74561a864d5285af /src
parent6f20e48d946fa3c90215f6affe5aa490559a6971 (diff)
downloadQt-856efef9bf87e0b7e5ed6ad2ccb225e294321888.zip
Qt-856efef9bf87e0b7e5ed6ad2ccb225e294321888.tar.gz
Qt-856efef9bf87e0b7e5ed6ad2ccb225e294321888.tar.bz2
Do not loop forever if we are adding the layout itself to the layout.
Reviewed-by: alexis
Diffstat (limited to 'src')
-rw-r--r--src/gui/graphicsview/qgraphicsgridlayout.cpp4
-rw-r--r--src/gui/graphicsview/qgraphicslinearlayout.cpp4
2 files changed, 8 insertions, 0 deletions
diff --git a/src/gui/graphicsview/qgraphicsgridlayout.cpp b/src/gui/graphicsview/qgraphicsgridlayout.cpp
index eef4e45..9a8dba0 100644
--- a/src/gui/graphicsview/qgraphicsgridlayout.cpp
+++ b/src/gui/graphicsview/qgraphicsgridlayout.cpp
@@ -154,6 +154,10 @@ void QGraphicsGridLayout::addItem(QGraphicsLayoutItem *item, int row, int column
qWarning("QGraphicsGridLayout::addItem: cannot add null item");
return;
}
+ if (item == this) {
+ qWarning("QGraphicsGridLayout::addItem: cannot insert itself");
+ return;
+ }
d->addChildLayoutItem(item);
diff --git a/src/gui/graphicsview/qgraphicslinearlayout.cpp b/src/gui/graphicsview/qgraphicslinearlayout.cpp
index 0aa68df..7ff7c9b 100644
--- a/src/gui/graphicsview/qgraphicslinearlayout.cpp
+++ b/src/gui/graphicsview/qgraphicslinearlayout.cpp
@@ -272,6 +272,10 @@ void QGraphicsLinearLayout::insertItem(int index, QGraphicsLayoutItem *item)
qWarning("QGraphicsLinearLayout::insertItem: cannot insert null item");
return;
}
+ if (item == this) {
+ qWarning("QGraphicsLinearLayout::insertItem: cannot insert itself");
+ return;
+ }
d->addChildLayoutItem(item);
Q_ASSERT(item);