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

Fix qApp macro implementation.

Browse source 
Reviewer: Renato Araújo <renato.filho@openbossa.org>
          Hugo Lima <hugo.lima@openbossa.org>
This commit is contained in:
Luciano Wolf 2010-07-07 13:52:55 -03:00
commit c737f90c1d
2 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
PySide/QtGui/glue/qapplication_init.cpp
View file

@ -41,11 +41,11 @@ int SbkQApplication_Init(PyObject* self, PyObject* args, PyObject*)
// Verify if qApp is in main module // Verify if qApp is in main module
const char QAPP_MACRO[] = "qApp"; const char QAPP_MACRO[] = "qApp";
PyObject* localsDict = PyEval_GetLocals(); PyObject* globalsDict = PyEval_GetGlobals();
if (localsDict) { if (globalsDict) {
PyObject* qAppObj = PyDict_GetItemString(localsDict, QAPP_MACRO); PyObject* qAppObj = PyDict_GetItemString(globalsDict, QAPP_MACRO);
if (qAppObj) if (qAppObj)
PyDict_SetItemString(localsDict, QAPP_MACRO, self); PyDict_SetItemString(globalsDict, QAPP_MACRO, self);
} }
PyObject_SetAttrString(moduleQtGui, QAPP_MACRO, self); PyObject_SetAttrString(moduleQtGui, QAPP_MACRO, self);

10
tests/QtGui/qapp_test.py
View file

@ -3,15 +3,17 @@
import unittest import unittest
from PySide import QtGui from PySide.QtGui import *
class QAppPresence(unittest.TestCase): class QAppPresence(unittest.TestCase):
def testQApp(self): def testQApp(self):
#QtGui.qApp variable is instance of QApplication #QtGui.qApp variable is instance of QApplication
self.assert_(isinstance(QtGui.qApp, QtGui.QApplication)) self.assert_(isinstance(qApp, QApplication))
def main():
app = QApplication([])
unittest.main()
if __name__ == '__main__': if __name__ == '__main__':
app = QtGui.QApplication([]) main()
unittest.main()