Fix qApp macro implementation.

Reviewer: Renato Araújo <renato.filho@openbossa.org>
          Hugo Lima <hugo.lima@openbossa.org>

2 files changed, 10 insertions, 8 deletions

diff --git a/PySide/QtGui/glue/qapplication_init.cpp b/PySide/QtGui/glue/qapplication_init.cpp
index 112b8e020..5c87af3b2 100644
--- a/PySide/QtGui/glue/qapplication_init.cpp
+++ b/PySide/QtGui/glue/qapplication_init.cpp
@@ -41,11 +41,11 @@ int SbkQApplication_Init(PyObject* self, PyObject* args, PyObject*)
 
     // Verify if qApp is in main module
     const char QAPP_MACRO[] = "qApp";
-    PyObject* localsDict = PyEval_GetLocals();
-    if (localsDict) {
-        PyObject* qAppObj = PyDict_GetItemString(localsDict, QAPP_MACRO);
+    PyObject* globalsDict = PyEval_GetGlobals();
+    if (globalsDict) {
+        PyObject* qAppObj = PyDict_GetItemString(globalsDict, QAPP_MACRO);
         if (qAppObj)
-            PyDict_SetItemString(localsDict, QAPP_MACRO, self);
+            PyDict_SetItemString(globalsDict, QAPP_MACRO, self);
     }
     PyObject_SetAttrString(moduleQtGui, QAPP_MACRO, self);
 
diff --git a/tests/QtGui/qapp_test.py b/tests/QtGui/qapp_test.py
index c371492e6..fd1d60fe4 100644
--- a/tests/QtGui/qapp_test.py
+++ b/tests/QtGui/qapp_test.py
@@ -3,15 +3,17 @@
 
 import unittest
 
-from PySide import QtGui
+from PySide.QtGui import *
 
 class QAppPresence(unittest.TestCase):
 
     def testQApp(self):
         #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__':
-    app = QtGui.QApplication([])
-    unittest.main()
+    main()