summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenato Araujo Oliveira Filho <renato.filho@openbossa.org>2011-01-18 14:42:02 -0300
committerHugo Parente Lima <hugo.pl@gmail.com>2012-03-08 16:51:47 -0300
commit4f72f1d3686a1bf3a249b5b3265d8e10e24014cf (patch)
tree6ec861e75da7388010d22726860bec0f0b58ed4e
parentf0181b754558580b90dae8868cb812fa0f6e4322 (diff)
Fixed Widget and Layout inject code to avoid problems in armel arch.
-rw-r--r--PySide/QtGui/glue/qlayout_help_functions.h2
-rw-r--r--PySide/QtGui/glue/qwidget_glue.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/PySide/QtGui/glue/qlayout_help_functions.h b/PySide/QtGui/glue/qlayout_help_functions.h
index 8420cb3a..90c950a5 100644
--- a/PySide/QtGui/glue/qlayout_help_functions.h
+++ b/PySide/QtGui/glue/qlayout_help_functions.h
@@ -40,7 +40,7 @@ inline void addLayoutOwnership(QLayout* layout, QLayout* other)
for (int i=0, i_max=other->count(); i < i_max; i++) {
QLayoutItem* item = other->itemAt(i);
- if (PyErr_Occurred())
+ if (PyErr_Occurred() || !item)
return;
addLayoutOwnership(layout, item);
diff --git a/PySide/QtGui/glue/qwidget_glue.h b/PySide/QtGui/glue/qwidget_glue.h
index 9b20cb5b..129a54a5 100644
--- a/PySide/QtGui/glue/qwidget_glue.h
+++ b/PySide/QtGui/glue/qwidget_glue.h
@@ -14,7 +14,7 @@ static inline void qwidgetReparentLayout(QWidget *parent, QLayout *layout)
for (int i=0; i < layout->count(); i++) {
QLayoutItem* item = layout->itemAt(i);
- if (PyErr_Occurred())
+ if (PyErr_Occurred() || !item)
return;
QWidget* w = item->widget();