diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2016-12-07 15:21:15 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2016-12-07 15:21:15 +0100 |
| commit | 48591ce7dc00ec2c00ec3983a9572398fbd794b8 (patch) | |
| tree | 304d40ab40e181aac8fe4e49e4ab9f274c52c1d9 /src/qml/qml/qqmlobjectcreator.cpp | |
| parent | b4ccdf004af8ab5b9e327abf7f87d0bd34ee13c0 (diff) | |
| parent | e0a3c6276a257aeb1cb3ef6d16a4dddcc65d8195 (diff) | |
Merge remote-tracking branch 'origin/5.8.0' into 5.8
Change-Id: I19804e880005c66880eeabfaebf0b1093de80e6b
Diffstat (limited to 'src/qml/qml/qqmlobjectcreator.cpp')
| -rw-r--r-- | src/qml/qml/qqmlobjectcreator.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlobjectcreator.cpp b/src/qml/qml/qqmlobjectcreator.cpp index 76829c48c9..f450cbf965 100644 --- a/src/qml/qml/qqmlobjectcreator.cpp +++ b/src/qml/qml/qqmlobjectcreator.cpp @@ -1015,7 +1015,7 @@ void QQmlObjectCreator::registerObjectWithContextById(const QV4::CompiledData::O QV4::Heap::QmlContext *QQmlObjectCreator::currentQmlContext() { - if (!_qmlContext->isObject()) + if (!_qmlContext->isManaged()) _qmlContext->setM(QV4::QmlContext::create(v4->rootContext(), context, _scopeObject)); return _qmlContext->d(); |