From 0c75c823b0c8e48f03fa0bb166b195bfa7d5f2e9 Mon Sep 17 00:00:00 2001 From: Christian Tismer Date: Tue, 20 Jul 2021 10:55:10 +0200 Subject: 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 Change-Id: I577331cfb2d7511110d1e16e729bed80985340a0 Reviewed-by: Friedemann Kleint (cherry picked from commit 9b5fa60d1fed5025e97c393ba1bab80f81ba833a) Reviewed-by: Cristian Maureira-Fredes Reviewed-by: Qt CI Bot --- sources/pyside2/tests/QtCore/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'sources/pyside2/tests/QtCore/CMakeLists.txt') diff --git a/sources/pyside2/tests/QtCore/CMakeLists.txt b/sources/pyside2/tests/QtCore/CMakeLists.txt index 9d268e079..c7e50d640 100644 --- a/sources/pyside2/tests/QtCore/CMakeLists.txt +++ b/sources/pyside2/tests/QtCore/CMakeLists.txt @@ -37,6 +37,7 @@ PYSIDE_TEST(deletelater_test.py) PYSIDE_TEST(destroysignal_test.py) PYSIDE_TEST(duck_punching_test.py) PYSIDE_TEST(emoji_string_test.py) +PYSIDE_TEST(feature_with_uic_test.py) PYSIDE_TEST(hash_test.py) PYSIDE_TEST(inherits_test.py) PYSIDE_TEST(max_signals.py) -- cgit v1.2.3