diff options
| author | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-04-24 10:06:19 +0200 |
|---|---|---|
| committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-04-24 11:46:49 +0200 |
| commit | 1f39b8ba2745f2b9ff462d40f6b0ca473c94484e (patch) | |
| tree | eee4831d3dd961680edddcef3ac78423fc77d8c1 /src/qml/qml/qqmlengine.h | |
| parent | b5fa1411a0109c332ffc7c3dbe9145f7ecc2c9a7 (diff) | |
Move object onwership functions from QQmlEngine to QJSEngine
[ChangeLog][QML] The setObjectOwnership and objectOwnership functions
have been moved from QQmlEngine to QJSEngine. This reflects the fact
that they have an effect on objects passed not only to a QQmlEngine, but
also to a QJSEngine. As QQmlEngine is a subclass of QJSEngine, existing
code continues to work.
Fixes: QTBUG-83657
Change-Id: Ib29cdb4a9884e1f1b68fcba64d32b1cb2e5a4297
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/qml/qml/qqmlengine.h')
| -rw-r--r-- | src/qml/qml/qqmlengine.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/qml/qml/qqmlengine.h b/src/qml/qml/qqmlengine.h index e301082064..aeb5756712 100644 --- a/src/qml/qml/qqmlengine.h +++ b/src/qml/qml/qqmlengine.h @@ -165,9 +165,6 @@ public: static QQmlContext *contextForObject(const QObject *); static void setContextForObject(QObject *, QQmlContext *); - enum ObjectOwnership { CppOwnership, JavaScriptOwnership }; - static void setObjectOwnership(QObject *, ObjectOwnership); - static ObjectOwnership objectOwnership(QObject *); protected: QQmlEngine(QQmlEnginePrivate &dd, QObject *p); bool event(QEvent *) override; |