diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2021-10-19 15:22:25 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2021-10-20 15:51:23 +0200 |
| commit | bf115a446c1a633a11577306eff8a78028a7f5b5 (patch) | |
| tree | 8a2cd7650fe9d5ace7bdfdaa31669fccd8f1021a /src/qml/qml/qqmlcomponent_p.h | |
| parent | 974e2c668ae6e942f9e5d3eda8d77b1893af371f (diff) | |
Improve type conversions from/to QJSValue
We can convert everything into a QJSValue if we have an engine and we
can save a binding function in a QVariant by wrapping it into QJSValue.
Change-Id: I48e7c13f3f744f1c50bf673b427fe9331250f313
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/qml/qml/qqmlcomponent_p.h')
| -rw-r--r-- | src/qml/qml/qqmlcomponent_p.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlcomponent_p.h b/src/qml/qml/qqmlcomponent_p.h index abc0de7438..59ef47f2c3 100644 --- a/src/qml/qml/qqmlcomponent_p.h +++ b/src/qml/qml/qqmlcomponent_p.h @@ -137,7 +137,9 @@ public: static void completeDeferred(QQmlEnginePrivate *enginePriv, DeferredState *deferredState); static void complete(QQmlEnginePrivate *enginePriv, ConstructionState *state); - static QQmlProperty removePropertyFromRequired(QObject *createdComponent, const QString &name, RequiredProperties& requiredProperties, bool *wasInRequiredProperties = nullptr); + static QQmlProperty removePropertyFromRequired( + QObject *createdComponent, const QString &name, RequiredProperties &requiredProperties, + QQmlEngine *engine, bool *wasInRequiredProperties = nullptr); QQmlEngine *engine; QQmlGuardedContextData creationContext; |