aboutsummaryrefslogtreecommitdiffstats
path: root/build_history
diff options
context:
space:
mode:
authorChristian Tismer <tismer@stackless.com>2021-07-20 10:55:10 +0200
committerChristian Tismer <tismer@stackless.com>2021-07-28 18:41:46 +0200
commit9b5fa60d1fed5025e97c393ba1bab80f81ba833a (patch)
tree4a3e9810b4d46ffa6ae3c8bc88ad9af18d0f2e36 /build_history
parentf0ebbfa8b128be39fe618188cad3320987c89051 (diff)
feature: fix the UIC switching problem
The BindingManager::getOverride function computes the current switch state from information of a type object. But the type object must first be updated in case a switch has happened. The solution was an extra update call at the beginning of the function. This solution _always_ works, with or without inheritance, for Python >= 3.7. [ChangeLog][shiboken6] Coexistence of different feature selections works now, especially for UIC files and inheritance. Fixes: PYSIDE-1626 Pick-to: 6.1 Pick-to: 5.15 Change-Id: I577331cfb2d7511110d1e16e729bed80985340a0 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'build_history')
-rw-r--r--build_history/blacklist.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/build_history/blacklist.txt b/build_history/blacklist.txt
index 7786fe989..e8c17cde9 100644
--- a/build_history/blacklist.txt
+++ b/build_history/blacklist.txt
@@ -47,6 +47,9 @@
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