diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-07-02 15:37:05 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-07-02 15:37:05 +0200 |
| commit | a883b9301cc189b40ceb5bcfbb75f98aab1b1778 (patch) | |
| tree | 20f8d392314430010bcb1f34a2ca227b5bd497ea /sources/pyside2/PySide2/QtCore | |
| parent | b2b5c8c274afaccbaef4437da8932364b9f07dbf (diff) | |
| parent | 423f12bb6908667e34a477ccf515a2377fc7a596 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I79d2166f18d8ed941c6c34fcbc7b185c2da02f0c
Diffstat (limited to 'sources/pyside2/PySide2/QtCore')
| -rw-r--r-- | sources/pyside2/PySide2/QtCore/typesystem_core_common.xml | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml index ef8b1b4c5..58db97aa8 100644 --- a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml +++ b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml @@ -303,8 +303,6 @@ </conversion-rule> </primitive-type> - <primitive-type name="QVariantMap" target-lang-api-name="PyDict"/> - <inject-code class="target" position="end" file="../glue/qtcore.cpp" snippet="qvariantmap-register"/> <inject-code class="native" position="beginning" file="../glue/qtcore.cpp" snippet="qvariantmap-check"/> <primitive-type name="QStringList"> <include file-name="QStringList" location="global"/> |