diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-11-30 14:56:31 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-11-30 14:56:57 +0100 |
| commit | 4b225a38cec88f8a2e898cef61c0e0218425268c (patch) | |
| tree | cf3d906be2eaf4c6f2a1c95a32a90bc62565fe18 /sources/pyside2/PySide2/QtCore | |
| parent | dbbddcd9a652f88c59a7101d3638f5ddc0ef7a5b (diff) | |
| parent | fc2cbed6d053f4287d981bcf68d435187dd7b1eb (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: Iedf9086aa8aea8587eb70fcf1770daf008ccc9cc
Diffstat (limited to 'sources/pyside2/PySide2/QtCore')
| -rw-r--r-- | sources/pyside2/PySide2/QtCore/typesystem_core_common.xml | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml index 577618f26..88d262ab7 100644 --- a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml +++ b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml @@ -74,6 +74,10 @@ <function signature="qrand()" /> <function signature="qsrand(uint)" /> + <inject-code class="native" position="beginning"> + #include <pyside.h> + </inject-code> + <template name="use_stream_for_format_security"> // Uses the stream version for security reasons // see gcc man page at -Wformat-security @@ -1080,12 +1084,10 @@ Shiboken::Conversions::registerConverterName(SbkPySide2_QtCoreTypeConverters[SBK_QSTRING_IDX], "str"); Shiboken::Conversions::registerConverterName(SbkPySide2_QtCoreTypeConverters[SBK_QTCORE_QLIST_QVARIANT_IDX], "QVariantList"); + PySide::registerInternalQtConf(); PySide::init(module); Py_AtExit(QtCoreModuleExit); </inject-code> - <inject-code class="native" position="beginning"> - #include <pyside.h> - </inject-code> <inject-code class="native" position="beginning"> // Define a global variable to handle qInstallMessageHandler callback |