diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-11-06 12:59:25 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-11-06 13:26:37 +0100 |
| commit | 06e4edac7133d322fe3398502396e1cd8afd8329 (patch) | |
| tree | ba4427a92c4f1eac1963a428a03edf2c0cea4248 /sources/pyside2/PySide2/QtCore | |
| parent | f2063ee4737f90c5d412a9a328672fde32b033eb (diff) | |
| parent | 764498b3d033a1c947a40dc1b2237e81b674992b (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.9
Change-Id: I72583df407fc5b3caa8bf35fd997889a4ac86512
Diffstat (limited to 'sources/pyside2/PySide2/QtCore')
| -rw-r--r-- | sources/pyside2/PySide2/QtCore/typesystem_core_common.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml index 2b441eba0..87eb0c9d6 100644 --- a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml +++ b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml @@ -354,7 +354,6 @@ </primitive-type> <primitive-type name="QVariant" target-lang-api-name="PyObject"> - <include file-name="typeresolver.h" location="global"/> <conversion-rule> <native-to-target> if (!%in.isValid()) @@ -797,7 +796,8 @@ <container-type name="QHash" type="hash"> <include file-name="QHash" location="global"/> - <include file-name="pysideconversions.h" location="global"/> + <!-- Include to make enum flags work. --> + <include file-name="pysideqflags.h" location="global"/> <conversion-rule> <native-to-target> <insert-template name="cppmap_to_pymap_conversion"/> |