diff options
| author | Christian Tismer <tismer@stackless.com> | 2020-02-13 13:35:03 +0100 |
|---|---|---|
| committer | Christian Tismer <tismer@stackless.com> | 2020-02-21 15:14:18 +0100 |
| commit | d579912b31d7cfa7b0b216916fbbf3eb632a9d9d (patch) | |
| tree | 0e206543adc1781003c39bdf8627af09cbe9270f /sources/pyside2/tests/pysidetest | |
| parent | f69d163d17d3717c28f2c065173113756d7c50ef (diff) | |
Turn qApp into a normal Python variable, finally
After a long odyssey of more or less unpythonic compromizes,
the qApp "macro" would finally be moved into a normal
variable without surprizes.
This was only possible since we removed qApp from QtWidgets
and other modules. Otherwise,
from PySide2.QtWidgets import *
would pull qApp, being the constant "None", into main and
shadow the true qApp variable in the builtins.
By inserting qApp into the builtins, only, we make sure that
this variable is always freshly looked up, without making it
change its contents.
DONE...
+ change the singleton code to normal
+ rename to MakeQAppWrapper
+ simplify the implementation
+ fix new bug concerning duplicate applications
+ check very much for refcounting bugs
+ review the rest of the implementation and further simplify
Note... The Q*Application variable will not be turned back into
a GC variable. This is not worth the effort.
Fixes: PYSIDE-571
Change-Id: Idbd158c083318e6b0dfe48d62485c68c90e944de
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'sources/pyside2/tests/pysidetest')
| -rw-r--r-- | sources/pyside2/tests/pysidetest/qapp_like_a_macro_test.py | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/sources/pyside2/tests/pysidetest/qapp_like_a_macro_test.py b/sources/pyside2/tests/pysidetest/qapp_like_a_macro_test.py index 43f455ea9..2cc18c9c9 100644 --- a/sources/pyside2/tests/pysidetest/qapp_like_a_macro_test.py +++ b/sources/pyside2/tests/pysidetest/qapp_like_a_macro_test.py @@ -32,6 +32,8 @@ import PySide2 # This test tests the new "macro" feature of qApp. # It also uses the qApp variable to finish the instance and start over. +# Note: this test makes qapplication_singleton_test.py obsolete. + class qAppMacroTest(unittest.TestCase): _test_1093_is_first = True @@ -44,13 +46,8 @@ class qAppMacroTest(unittest.TestCase): QtWidgets = QtGui = QtCore # qApp is in the builtins self.assertEqual(bool(qApp), False) - # and also in certain PySide modules - QtCore.qApp, QtGui.qApp, QtWidgets.qApp - # and they are all the same - self.assertTrue(qApp is QtCore.qApp is QtGui.qApp is QtWidgets.qApp) - # and the type is NoneType, but it is not None (cannot work) - self.assertTrue(type(qApp) is type(None)) - self.assertTrue(qApp is not None) + # and the type is None + self.assertTrue(qApp is None) # now we create an application for all cases classes = (QtCore.QCoreApplication, QtGui.QGuiApplication, @@ -63,9 +60,7 @@ class qAppMacroTest(unittest.TestCase): QtCore.QCoreApplication([]) with self.assertRaises(RuntimeError): QtCore.QCoreApplication([]) - self.assertEqual(QtCore.QCoreApplication.instance(), QtCore.qApp) - # and they are again all the same - self.assertTrue(qApp is QtCore.qApp is QtGui.qApp is QtWidgets.qApp) + self.assertEqual(QtCore.QCoreApplication.instance(), qApp) def test_1093(self): # Test that without creating a QApplication staticMetaObject still exists. |