jyapayne/PySide
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix bug 797 - "error on ui file load"

Browse source 
Reviewer: Marcelo Lira <marcelo.lira@openbossa.org>
          Renato Araújo <renato.filho@openbossa.org>
This commit is contained in:
Hugo Parente Lima 2011-05-03 16:37:07 -03:00
commit fd2abb11f5
3 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
PySide/QtUiTools/typesystem_uitools.xml
View file

@ -105,7 +105,7 @@
<parent index="2" action="add"/> <parent index="2" action="add"/>
</modify-argument> </modify-argument>
<inject-code> <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); %PYARG_0 = quiloader_load_ui_from_device(%CPPSELF, %1, %2);
</inject-code> </inject-code>
</modify-function> </modify-function>
@ -123,7 +123,7 @@
<parent index="2" action="add"/> <parent index="2" action="add"/>
</modify-argument> </modify-argument>
<inject-code> <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); %PYARG_0 = quiloader_load_ui(%CPPSELF, %1, %2);
</inject-code> </inject-code>
</add-function> </add-function>

1
tests/QtUiTools/CMakeLists.txt
View file

@ -3,5 +3,6 @@ PYSIDE_TEST(bug_376.py)
PYSIDE_TEST(bug_392.py) PYSIDE_TEST(bug_392.py)
PYSIDE_TEST(bug_426.py) PYSIDE_TEST(bug_426.py)
PYSIDE_TEST(bug_552.py) PYSIDE_TEST(bug_552.py)
PYSIDE_TEST(bug_797.py)
PYSIDE_TEST(uiloader_test.py) PYSIDE_TEST(uiloader_test.py)
PYSIDE_TEST(ui_test.py) PYSIDE_TEST(ui_test.py)

11
tests/QtUiTools/bug_797.py Normal file
View file

@ -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)