diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-08-17 07:41:37 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-08-17 07:41:37 +0200 |
| commit | f440ebfd838d0b754bbba38fbbd2ccf5318f7347 (patch) | |
| tree | 53d1431ceb7d64826a86f812c4b9a4fe3310f846 /sources/pyside2/PySide2 | |
| parent | 7a1fe1519159a8bcaa61aec35c1d942ed024bf73 (diff) | |
| parent | 58a0d36d9271e91bd21272a9fe3b736dd90db58d (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Icee2cd5a37181070d8ef50e7143868d4f126cea5
Diffstat (limited to 'sources/pyside2/PySide2')
| -rw-r--r-- | sources/pyside2/PySide2/QtCore/typesystem_core_common.xml | 4 | ||||
| -rw-r--r-- | sources/pyside2/PySide2/__init__.py.in | 16 | ||||
| -rw-r--r-- | sources/pyside2/PySide2/glue/qtcore.cpp | 4 |
3 files changed, 23 insertions, 1 deletions
diff --git a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml index 982674500..d43c5a29b 100644 --- a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml +++ b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml @@ -647,6 +647,10 @@ <inject-code class="target" position="beginning" file="../glue/qtcore.cpp" snippet="qt-qflag"/> </add-function> + <add-function signature="__init_feature__()"> + <inject-code class="target" position="beginning" file="../glue/qtcore.cpp" snippet="qt-init-feature"/> + </add-function> + <add-function signature="qAbs(double)" return-type="double"> <inject-code class="target" position="beginning" file="../glue/qtcore.cpp" snippet="qt-qabs"/> </add-function> diff --git a/sources/pyside2/PySide2/__init__.py.in b/sources/pyside2/PySide2/__init__.py.in index f860c6ac9..5c33c57a0 100644 --- a/sources/pyside2/PySide2/__init__.py.in +++ b/sources/pyside2/PySide2/__init__.py.in @@ -1,6 +1,7 @@ from __future__ import print_function import os import sys +from textwrap import dedent __all__ = list("Qt" + body for body in "@all_module_shortnames@" @@ -62,7 +63,20 @@ def _setupQtDirectories(): raise # Trigger signature initialization. - type.__signature__ + try: + type.__signature__ + except AttributeError: + print(dedent('''\ + {stars} + PySide2/__init__.py: The `signature` module was not initialized. + This libshiboken module was loaded from + + "{shiboken2.__file__}". + + Please make sure that this is the real shiboken2 binary and not just a folder. + {stars} + ''').format(stars=79*"*", **locals()), file=sys.stderr) + raise if sys.platform == 'win32': # PATH has to contain the package directory, otherwise plugins diff --git a/sources/pyside2/PySide2/glue/qtcore.cpp b/sources/pyside2/PySide2/glue/qtcore.cpp index 6d8c0876d..092bfab80 100644 --- a/sources/pyside2/PySide2/glue/qtcore.cpp +++ b/sources/pyside2/PySide2/glue/qtcore.cpp @@ -595,6 +595,10 @@ PySide::runCleanupFunctions(); %PYARG_0 = PySide::QEnum::QEnumMacro(%1, true); // @snippet qt-qflag +// @snippet qt-init-feature +PySide::Feature::init(); +// @snippet qt-init-feature + // @snippet qt-pysideinit Shiboken::Conversions::registerConverterName(SbkPySide2_QtCoreTypeConverters[SBK_QSTRING_IDX], "unicode"); Shiboken::Conversions::registerConverterName(SbkPySide2_QtCoreTypeConverters[SBK_QSTRING_IDX], "str"); |