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/glue | |
| parent | 7a1fe1519159a8bcaa61aec35c1d942ed024bf73 (diff) | |
| parent | 58a0d36d9271e91bd21272a9fe3b736dd90db58d (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Icee2cd5a37181070d8ef50e7143868d4f126cea5
Diffstat (limited to 'sources/pyside2/PySide2/glue')
| -rw-r--r-- | sources/pyside2/PySide2/glue/qtcore.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
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"); |