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/qqmlcontext.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/qqmlcontext.cpp')
| -rw-r--r-- | src/qml/qml/qqmlcontext.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/qml/qml/qqmlcontext.cpp b/src/qml/qml/qqmlcontext.cpp index de43108312..0b0132fab7 100644 --- a/src/qml/qml/qqmlcontext.cpp +++ b/src/qml/qml/qqmlcontext.cpp @@ -587,6 +587,8 @@ void QQmlContextData::invalidate() prevChild = 0; } + importedScripts.clear(); + engine = 0; parent = 0; } |