aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenato Filho <renato.filho@openbossa.org>2011-06-16 17:00:27 -0300
committerHugo Parente Lima <hugo.pl@gmail.com>2012-03-08 16:54:29 -0300
commita208d34edee970a655557969de4e2be3bfccf423 (patch)
tree9375772b38bcd290eae822d1f3015261405aad0c
parentaf2972255d9977541b6cd40521ea9a387f24b452 (diff)
Fill qApp is any QApplication is active during the QtGui moude import.
Reviewer: Marcelo Lira <marcelo.lira@openbossa.org> Hugo Parente Lima <hugo.pl@gmail.com>
-rw-r--r--PySide/QtGui/glue/qtgui_qapp.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/PySide/QtGui/glue/qtgui_qapp.cpp b/PySide/QtGui/glue/qtgui_qapp.cpp
index f893f8e49..4c4508b70 100644
--- a/PySide/QtGui/glue/qtgui_qapp.cpp
+++ b/PySide/QtGui/glue/qtgui_qapp.cpp
@@ -1,4 +1,10 @@
// Init qApp macro to None.
-Py_INCREF(Py_None);
-PyModule_AddObject(module, "qApp", Py_None);
+if (qApp) {
+ PyObject* pyApp = Shiboken::Converter<QApplication*>::toPython(qApp);
+ Py_INCREF(pyApp);
+ PyModule_AddObject(module, "qApp", pyApp);
+} else {
+ Py_INCREF(Py_None);
+ PyModule_AddObject(module, "qApp", Py_None);
+}
moduleQtGui = module;