diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-07-03 08:24:42 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-07-03 08:24:47 +0200 |
| commit | 67d635fe2cc2c89c30486a2e26dea4106a9d9c16 (patch) | |
| tree | b26f1bb7a9639f2b2a875c0cb2b937858b700add /sources/pyside2/PySide2/QtQml/pysideqmlregistertype.h | |
| parent | ffd068caf7063799e0196602e31ca7b1781c3f97 (diff) | |
| parent | 75f824b13a2ef12a9a5a33db19216b4e43a72922 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I389468b76913ac3c8113ab89833c756a7a72e54f
Diffstat (limited to 'sources/pyside2/PySide2/QtQml/pysideqmlregistertype.h')
| -rw-r--r-- | sources/pyside2/PySide2/QtQml/pysideqmlregistertype.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sources/pyside2/PySide2/QtQml/pysideqmlregistertype.h b/sources/pyside2/PySide2/QtQml/pysideqmlregistertype.h index 0ef6539a5..e94ea043f 100644 --- a/sources/pyside2/PySide2/QtQml/pysideqmlregistertype.h +++ b/sources/pyside2/PySide2/QtQml/pysideqmlregistertype.h @@ -47,7 +47,7 @@ struct SbkObjectType; namespace PySide { -extern void* nextQmlElementMemoryAddr; +extern void *nextQmlElementMemoryAddr; /** * Init the QML support doing things like registering QtQml.ListProperty and create the necessary stuff for @@ -55,7 +55,7 @@ extern void* nextQmlElementMemoryAddr; * * \param module QtQml python module */ -void initQmlSupport(PyObject* module); +void initQmlSupport(PyObject *module); /** * PySide implementation of qmlRegisterType<T> function. |