diff options
| -rw-r--r-- | PySide/QtUiTools/typesystem_uitools.xml | 4 | ||||
| -rw-r--r-- | tests/QtUiTools/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | tests/QtUiTools/bug_797.py | 11 |
3 files changed, 14 insertions, 2 deletions
diff --git a/PySide/QtUiTools/typesystem_uitools.xml b/PySide/QtUiTools/typesystem_uitools.xml index 7887eba5c..130880cf2 100644 --- a/PySide/QtUiTools/typesystem_uitools.xml +++ b/PySide/QtUiTools/typesystem_uitools.xml @@ -105,7 +105,7 @@ <parent index="2" action="add"/> </modify-argument> <inject-code> - //Avoid calling the original function: %CPPSELF.load + // Avoid calling the original function: %CPPSELF.%FUNCTION_NAME() %PYARG_0 = quiloader_load_ui_from_device(%CPPSELF, %1, %2); </inject-code> </modify-function> @@ -123,7 +123,7 @@ <parent index="2" action="add"/> </modify-argument> <inject-code> - //Avoid calling the original function: %CPPSELF.load + // Avoid calling the original function: %CPPSELF.%FUNCTION_NAME() %PYARG_0 = quiloader_load_ui(%CPPSELF, %1, %2); </inject-code> </add-function> diff --git a/tests/QtUiTools/CMakeLists.txt b/tests/QtUiTools/CMakeLists.txt index 131adfed1..4c055ecee 100644 --- a/tests/QtUiTools/CMakeLists.txt +++ b/tests/QtUiTools/CMakeLists.txt @@ -3,5 +3,6 @@ PYSIDE_TEST(bug_376.py) PYSIDE_TEST(bug_392.py) PYSIDE_TEST(bug_426.py) PYSIDE_TEST(bug_552.py) +PYSIDE_TEST(bug_797.py) PYSIDE_TEST(uiloader_test.py) PYSIDE_TEST(ui_test.py) diff --git a/tests/QtUiTools/bug_797.py b/tests/QtUiTools/bug_797.py new file mode 100644 index 000000000..f61a22f8b --- /dev/null +++ b/tests/QtUiTools/bug_797.py @@ -0,0 +1,11 @@ +from PySide import QtUiTools +from PySide import QtCore +from PySide import QtGui +from helper import adjust_filename + +app = QtGui.QApplication([]) +loader = QtUiTools.QUiLoader() +file = QtCore.QFile(adjust_filename('bug_552.ui', __file__)) +w = QtGui.QWidget() +# An exception can't be thrown +mainWindow = loader.load(file, w) |