diff options
author | Christian Tismer <tismer@stackless.com> | 2019-08-31 19:02:31 +0200 |
---|---|---|
committer | Christian Tismer <tismer@stackless.com> | 2019-09-13 05:43:32 +0200 |
commit | 1cc1c93838ddae86ee6c1cacb467a92aac73b9a0 (patch) | |
tree | cf0f10f2c1fe84201bf1dc815ce6f63210ca2311 /sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/lib/enum_sig.py | |
parent | fca529c5ed32e8786a98fabbde2f01749130f773 (diff) |
Fix Signature after Merging 5.14
Somehow, a few changes had diverged and needed fixing.
No idea how this could have passed CI - was it deactivated?
This checkin also changes the "*.inc" file names to "_inc.h"
in favor of one developer's needs.
Change-Id: I0687bc2ba542e07da796b9d0eebc0f16210e8387
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/lib/enum_sig.py')
-rw-r--r-- | sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/lib/enum_sig.py | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/lib/enum_sig.py b/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/lib/enum_sig.py index b026a5d20..b84a20e16 100644 --- a/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/lib/enum_sig.py +++ b/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/lib/enum_sig.py @@ -52,11 +52,6 @@ by producing a lot of clarity. import sys from shibokensupport.signature import inspect from shibokensupport.signature import get_signature -try: - from PySide2.QtCore import Qt - EnumType = type(Qt.Key) -except ImportError: - EnumType = None class ExactEnumerator(object): @@ -69,6 +64,14 @@ class ExactEnumerator(object): """ def __init__(self, formatter, result_type=dict): + global EnumType + try: + # Lazy import + from PySide2.QtCore import Qt + EnumType = type(Qt.Key) + except ImportError: + EnumType = None + self.fmt = formatter self.result_type = result_type self.fmt.level = 0 |