diff options
| author | Maximilian Goldstein <max.goldstein@qt.io> | 2020-05-29 14:18:34 +0200 |
|---|---|---|
| committer | Maximilian Goldstein <max.goldstein@qt.io> | 2020-07-10 10:02:20 +0200 |
| commit | aab3f9e732829692672f9bb3e54a209d9b5d97b1 (patch) | |
| tree | b3508061d93fe278cbe7dbc7a136af86f018f8b9 /src/qml/qml/qqmltype.cpp | |
| parent | 0cfb44bf2972dc006ec6042b676f86d6059d0890 (diff) | |
Add userdata callback to qml registration
This is needed in order to remove PySide2's qml type limit.
Change-Id: I331d9e31574a744eb9085222d58ea8a8789e0e31
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/qml/qml/qqmltype.cpp')
| -rw-r--r-- | src/qml/qml/qqmltype.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/qml/qml/qqmltype.cpp b/src/qml/qml/qqmltype.cpp index 26c970bf60..bdca223bae 100644 --- a/src/qml/qml/qqmltype.cpp +++ b/src/qml/qml/qqmltype.cpp @@ -466,7 +466,8 @@ QObject *QQmlType::create() const d->init(); QObject *rv = (QObject *)operator new(d->extraData.cd->allocationSize); - d->extraData.cd->newFunc(rv); + + d->extraData.cd->newFunc(rv, d->extraData.cd->userdata); if (rv && !d->metaObjects.isEmpty()) (void)new QQmlProxyMetaObject(rv, &d->metaObjects); @@ -482,7 +483,7 @@ void QQmlType::create(QObject **out, void **memory, size_t additionalMemory) con d->init(); QObject *rv = (QObject *)operator new(d->extraData.cd->allocationSize + additionalMemory); - d->extraData.cd->newFunc(rv); + d->extraData.cd->newFunc(rv, d->extraData.cd->userdata); if (rv && !d->metaObjects.isEmpty()) (void)new QQmlProxyMetaObject(rv, &d->metaObjects); |