From a208d34edee970a655557969de4e2be3bfccf423 Mon Sep 17 00:00:00 2001 From: Renato Filho Date: Thu, 16 Jun 2011 17:00:27 -0300 Subject: Fill qApp is any QApplication is active during the QtGui moude import. Reviewer: Marcelo Lira Hugo Parente Lima --- PySide/QtGui/glue/qtgui_qapp.cpp | 10 ++++++++-- 1 file 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::toPython(qApp); + Py_INCREF(pyApp); + PyModule_AddObject(module, "qApp", pyApp); +} else { + Py_INCREF(Py_None); + PyModule_AddObject(module, "qApp", Py_None); +} moduleQtGui = module; -- cgit v1.2.3