diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-18 13:37:02 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-02-18 13:37:02 +0100 |
| commit | ba05397ad723fa19125eb5ca2f91c7f437b21484 (patch) | |
| tree | e236df3317828f02ec1e8f28d87125bcc286b2d9 /src/qml/qml/qqmltypeloader.cpp | |
| parent | b2c71d6518143b3d2a9bd3aef1d72ee5929891fc (diff) | |
| parent | 0e64bd96fbf26855a65e38847083dbd2c6bee4ac (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.11
Conflicts:
.qmake.conf
tests/auto/qml/qqmlcontext/tst_qqmlcontext.cpp
Change-Id: I7feb9772fc35066f56b7c073482b53ca8c86c70b
Diffstat (limited to 'src/qml/qml/qqmltypeloader.cpp')
| -rw-r--r-- | src/qml/qml/qqmltypeloader.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/qml/qml/qqmltypeloader.cpp b/src/qml/qml/qqmltypeloader.cpp index 0be83f6ba6..e5682df761 100644 --- a/src/qml/qml/qqmltypeloader.cpp +++ b/src/qml/qml/qqmltypeloader.cpp @@ -2916,6 +2916,7 @@ QV4::ReturnedValue QQmlScriptData::scriptValueForContext(QQmlContextData *parent m_program->qmlContext.set(scope.engine, qmlContext); m_program->run(); + m_program->qmlContext.clear(); if (scope.engine->hasException) { QQmlError error = scope.engine->catchExceptionAsQmlError(); if (error.isValid()) |