Merge tag 'v5.15.5-lts' into tqtc/lts-5.15-opensourcev5.15.5-lts-lgpl

Qt For Python Release 5.15.5

Change-Id: Id8648afb982e4f1354257a0b523bc9c6f1acce2a

1 files changed, 4 insertions, 7 deletions

diff --git a/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/feature.py b/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/feature.py
index ece3d2edb..e2edfe391 100644
--- a/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/feature.py
+++ b/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/feature.py
@@ -132,13 +132,10 @@ def _import(name, *args, **kwargs):
         sys.modules["PySide2.QtCore"].__init_feature__()
         return sys.modules["__feature__"]
 
-    if name.split(".")[0] == "PySide2":
-        # This is a module that imports PySide2.
-        flag = existing if isinstance(existing, int) else 0
-    else:
-        # This is some other module. Ignore it in switching.
-        flag = -1
-    pyside_feature_dict[importing_module] = flag
+    if importing_module not in pyside_feature_dict:
+        # Ignore new modules if not from PySide.
+        default = 0 if name.split(".")[0] == "PySide2" else -1
+        pyside_feature_dict[importing_module] = default
     return original_import(name, *args, **kwargs)
 
 _is_initialized = False