aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2021-07-29 13:49:44 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-07-29 14:44:02 +0000
commit1c5b38b7b49087e913439dc7b66669aa6e0c7157 (patch)
tree2f0c4aa45fb8e6710596e6822fa0b1ee25436a58
parent3833b0aacc84924bd41cb03ab11cab0f18cd0dc9 (diff)
PySide6: Work around uic feature test failure
Use QCoreApplication.process_events() instead of qApp..process_events() which causes: AttributeError: 'PySide6.QtWidgets.QApplication' object has no attribute 'process_events' Amends 9b5fa60d1fed5025e97c393ba1bab80f81ba833a. Task-number: PYSIDE-1626 Change-Id: I7a268c8fa5b699813dfcb37a3093bd897fec381c Reviewed-by: Christian Tismer <tismer@stackless.com> (cherry picked from commit d57e16a89fb963c7416f6a9875773ac0edbcb032) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--build_history/blacklist.txt3
-rw-r--r--sources/pyside6/tests/QtCore/feature_with_uic_test.py4
2 files changed, 2 insertions, 5 deletions
diff --git a/build_history/blacklist.txt b/build_history/blacklist.txt
index e8c17cde9..7786fe989 100644
--- a/build_history/blacklist.txt
+++ b/build_history/blacklist.txt
@@ -47,9 +47,6 @@
darwin ci
[QtWidgets::qpicture_test]
darwin ci
-# Incomplehensible effect with feature switching on 3.6, qApp.process_events()
-[QtCore::feature_with_uic_test]
- py3.6
# Unsolved Refcounting leaks in debug mode
[pysidetest::property_python_test]
debug
diff --git a/sources/pyside6/tests/QtCore/feature_with_uic_test.py b/sources/pyside6/tests/QtCore/feature_with_uic_test.py
index 001ab36f6..09f25e585 100644
--- a/sources/pyside6/tests/QtCore/feature_with_uic_test.py
+++ b/sources/pyside6/tests/QtCore/feature_with_uic_test.py
@@ -59,7 +59,7 @@ init_test_paths(False)
from helper.usesqapplication import UsesQApplication
-from PySide6.QtCore import QLibraryInfo, qVersion
+from PySide6.QtCore import QCoreApplication, QLibraryInfo, qVersion
from PySide6.QtWidgets import QApplication, QMainWindow
from __feature__ import snake_case
@@ -81,7 +81,7 @@ class FeatureTest(UsesQApplication):
window.set_window_title(qVersion())
window.show()
while not window.window_handle().is_exposed():
- qApp.process_events()
+ QCoreApplication.process_events()
if __name__ == '__main__':