diff options
| author | Christian Tismer <tismer@stackless.com> | 2020-01-12 13:04:09 +0100 |
|---|---|---|
| committer | Cristián Maureira-Fredes <cristian.maureira-fredes@qt.io> | 2020-01-29 07:48:01 +0100 |
| commit | 8c5b08a74650e5dea7303d6f232c4df0f706cb35 (patch) | |
| tree | 265cbde75594202b8f3a9002611eea50b5a77f4a /sources/pyside2/PySide2/QtCore/typesystem_core_common.xml | |
| parent | 3fb91c8759fd8cf13dede5973b5c7ff0535533fa (diff) | |
Let qApp be noApp instead of pretending to be None
qApp should stay almost as it is with only two cosmetic changes:
When qApp's return value has Type(Py_None), the value now reports
"noApp" instead of "None".
Also the feature of "del __builtins__.qApp" is replaced by function
qApp.shutdown() . This makes things easier to explain and avoids
refcounting hacks.
The embedding problem (Falkon browser) was too complicated.
We finally solved it by disabling qApp in embedded mode.
Change-Id: I0d99661137130684823aa3d1978b494d8ab08e59
Fixes: PYSIDE-1158
Fixes: PYSIDE-1178
Fixes: PYSIDE-1135
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'sources/pyside2/PySide2/QtCore/typesystem_core_common.xml')
| -rw-r--r-- | sources/pyside2/PySide2/QtCore/typesystem_core_common.xml | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml index eec33ea68..9b139668c 100644 --- a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml +++ b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml @@ -2486,6 +2486,13 @@ <add-function signature="QCoreApplication()"> <inject-code file="../glue/qtcore.cpp" snippet="qcoreapplication-2"/> </add-function> + <!-- Addition for qApp. + To be fixed: This function deletes a little too much ATM that is missing later + when creating a new qApp. --> + <add-function signature="shutdown()"> + <inject-code class="target" position="beginning" file="../glue/qtcore.cpp" snippet="moduleshutdown"/> + </add-function> + <!-- blocking functions --> <modify-function signature="processEvents(QFlags<QEventLoop::ProcessEventsFlag>,int)" allow-thread="yes"/> <modify-function signature="processEvents(QFlags<QEventLoop::ProcessEventsFlag>)" allow-thread="yes"/> |