diff options
| -rw-r--r-- | PySide/QtGui/typesystem_gui_common.xml | 2 | ||||
| -rw-r--r-- | tests/QtGui/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | tests/QtGui/qicon_test.py | 17 |
3 files changed, 20 insertions, 0 deletions
diff --git a/PySide/QtGui/typesystem_gui_common.xml b/PySide/QtGui/typesystem_gui_common.xml index 724d50630..38646d2b1 100644 --- a/PySide/QtGui/typesystem_gui_common.xml +++ b/PySide/QtGui/typesystem_gui_common.xml @@ -719,11 +719,13 @@ <modify-function signature="serialNumber()const" remove="all"/> <modify-function signature="QIcon(QIconEngineV2 *)"> <modify-argument index="1"> + <no-null-pointer/> <parent index="this" action="add"/> </modify-argument> </modify-function> <modify-function signature="QIcon(QIconEngine *)"> <modify-argument index="1"> + <no-null-pointer/> <parent index="this" action="add"/> </modify-argument> </modify-function> diff --git a/tests/QtGui/CMakeLists.txt b/tests/QtGui/CMakeLists.txt index 9e5b0c3de..4c5202c43 100644 --- a/tests/QtGui/CMakeLists.txt +++ b/tests/QtGui/CMakeLists.txt @@ -98,6 +98,7 @@ PYSIDE_TEST(qgraphicsitem_isblocked_test.py) PYSIDE_TEST(qgraphicsitem_test.py) PYSIDE_TEST(qgraphicsproxywidget_test.py) PYSIDE_TEST(qgraphicsscene_test.py) +PYSIDE_TEST(qicon_test.py) PYSIDE_TEST(qimage_test.py) PYSIDE_TEST(qinputcontext_test.py) PYSIDE_TEST(qinputdialog_get_test.py) diff --git a/tests/QtGui/qicon_test.py b/tests/QtGui/qicon_test.py new file mode 100644 index 000000000..738e72c50 --- /dev/null +++ b/tests/QtGui/qicon_test.py @@ -0,0 +1,17 @@ + +import unittest + +from helper import TimedQApplication +from PySide.QtGui import QIcon + + +class QIconCtorWithNoneTest(TimedQApplication): + '''Test made by seblin, see Bug #944: http://bugs.pyside.org/show_bug.cgi?id=944''' + + def testQIconCtorWithNone(self): + icon = QIcon(None) + pixmap = icon.pixmap(48, 48) + self.app.exec_() + +if __name__ == '__main__': + unittest.main() |