diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-10 20:45:46 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-10 20:45:46 +0100 |
| commit | 6c090cd8d0e501b340190d96854145deb2299b26 (patch) | |
| tree | 73dbee34347724a55de8180d61caa3e78b512aa3 /src/qml/qml/qqmlxmlhttprequest.cpp | |
| parent | ebc76aeea24389e8494b95fd3fbdc446dd62d441 (diff) | |
| parent | 74580d00921ce7cc6f8baf70b15903f5cf707b78 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
src/plugins/qmltooling/qmldbg_debugger/qqmlenginedebugservice.h
tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
tests/auto/quick/qquicktextedit/qquicktextedit.pro
tests/auto/quick/qquicktextinput/qquicktextinput.pro
Change-Id: I95d2c20a8619e5b8fa361c941a16dd8dce3e04e7
Diffstat (limited to 'src/qml/qml/qqmlxmlhttprequest.cpp')
| -rw-r--r-- | src/qml/qml/qqmlxmlhttprequest.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/qml/qml/qqmlxmlhttprequest.cpp b/src/qml/qml/qqmlxmlhttprequest.cpp index ea1f18ab8e..e86956d3b2 100644 --- a/src/qml/qml/qqmlxmlhttprequest.cpp +++ b/src/qml/qml/qqmlxmlhttprequest.cpp @@ -856,6 +856,7 @@ ReturnedValue Document::load(ExecutionEngine *v4, const QByteArray &data) } ScopedObject instance(scope, v4->memoryManager->allocObject<Node>(document)); + document->release(); // the GC should own the NodeImpl via Node now ScopedObject p(scope); instance->setPrototype((p = Document::prototype(v4))); return instance.asReturnedValue(); |